35 lines
1.2 KiB
Plaintext
35 lines
1.2 KiB
Plaintext
$OpenBSD: patch-sqlplusint_compare1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
--- sqlplusint/compare1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
+++ sqlplusint/compare1.hh 2004-01-05 00:31:52.000000000 +0100
|
|
@@ -1,11 +1,11 @@
|
|
#ifndef __compare1_hh__
|
|
#define __compare1_hh__
|
|
|
|
-#include <function.h>
|
|
+#include <functional>
|
|
#include "row1.hh"
|
|
|
|
template <class BinaryPred, class CmpType>
|
|
-class MysqlCmp : public unary_function<const MysqlRow&, bool>
|
|
+class MysqlCmp : public std::unary_function<const MysqlRow&, bool>
|
|
{
|
|
protected:
|
|
unsigned int index;
|
|
@@ -19,6 +19,7 @@ public:
|
|
template <class BinaryPred>
|
|
class MysqlCmpCStr : public MysqlCmp<BinaryPred, const char *>
|
|
{
|
|
+ class CmpType cmp2;
|
|
public:
|
|
MysqlCmpCStr(uint i, const BinaryPred &f, const char* c) : MysqlCmp<BinaryPred, const char *> (i,f,c) {}
|
|
bool operator () (const MysqlRow& cmp1) const
|
|
@@ -36,7 +37,7 @@ mysql_cmp(uint i, const BinaryPred &func
|
|
return MysqlCmp<BinaryPred, CmpType>(i, func, cmp2);
|
|
}
|
|
|
|
-typedef binary_function<const char*, const char*, bool> bin_char_pred;
|
|
+typedef std::binary_function<const char*, const char*, bool> bin_char_pred;
|
|
|
|
struct cstr_equal_to : bin_char_pred {
|
|
bool operator () (const char *x, const char *y) const
|