diff options
| author | joerg <joerg> | 2012-11-16 00:41:33 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-11-16 00:41:33 +0000 |
| commit | e733a4986b668b56a6c25e726d072b87e55a9f19 (patch) | |
| tree | 1cbeb7a958efae5168f585f5fa5dae9b24cf6c1d /databases/libpqxx/patches | |
| parent | 21a08cb7c08477ec4e8b3e207c5ec2d796d6e088 (diff) | |
| download | pkgsrc-e733a4986b668b56a6c25e726d072b87e55a9f19.tar.gz | |
Define namespace std before using it. Some of the configure tests don't
include C++ headers. Fix template look up.
Diffstat (limited to 'databases/libpqxx/patches')
| -rw-r--r-- | databases/libpqxx/patches/patch-aa | 13 | ||||
| -rw-r--r-- | databases/libpqxx/patches/patch-include_pqxx_largeobject.hxx | 46 |
2 files changed, 57 insertions, 2 deletions
diff --git a/databases/libpqxx/patches/patch-aa b/databases/libpqxx/patches/patch-aa index 9d5b900c344..168195ce1b5 100644 --- a/databases/libpqxx/patches/patch-aa +++ b/databases/libpqxx/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2005/06/27 01:57:26 markd Exp $ +$NetBSD: patch-aa,v 1.2 2012/11/16 00:41:33 joerg Exp $ ---- configure.orig 2005-06-21 22:51:02.000000000 +1200 +--- configure.orig 2005-07-01 07:52:28.000000000 +0000 +++ configure @@ -19403,7 +19403,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.1 2005/06/27 01:57:26 markd Exp $ for option in $* ; do SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $option" +@@ -19650,7 +19650,7 @@ _ACEOF + echo "$as_me:$LINENO: result: ${std}" >&5 + echo "${ECHO_T}${std}" >&6 + if ! test -z "${std}" ; then +- usestd="using namespace ${std};" ++ usestd="namespace ${std} {} using namespace ${std};" + fi + + diff --git a/databases/libpqxx/patches/patch-include_pqxx_largeobject.hxx b/databases/libpqxx/patches/patch-include_pqxx_largeobject.hxx new file mode 100644 index 00000000000..22edc19b5ec --- /dev/null +++ b/databases/libpqxx/patches/patch-include_pqxx_largeobject.hxx @@ -0,0 +1,46 @@ +$NetBSD: patch-include_pqxx_largeobject.hxx,v 1.1 2012/11/16 00:41:33 joerg Exp $ + +--- include/pqxx/largeobject.hxx.orig 2012-11-15 13:15:39.000000000 +0000 ++++ include/pqxx/largeobject.hxx +@@ -382,7 +382,7 @@ protected: + virtual int sync() + { + // setg() sets eback, gptr, egptr +- setg(this->eback(), this->eback(), this->egptr()); ++ this->setg(this->eback(), this->eback(), this->egptr()); + return overflow(EoF()); + } + +@@ -403,7 +403,7 @@ protected: + int_type res = 0; + + if (pp > pb) res = AdjustEOF(m_Obj.cwrite(pb, pp-pb)); +- setp(m_P, m_P + m_BufSize); ++ this->setp(m_P, m_P + m_BufSize); + + // Write that one more character, if it's there. + if (ch != EoF()) +@@ -419,7 +419,7 @@ protected: + if (!this->gptr()) return EoF(); + char *const eb = this->eback(); + const int res = AdjustEOF(m_Obj.cread(this->eback(), m_BufSize)); +- setg(eb, eb, eb + ((res==EoF()) ? 0 : res)); ++ this->setg(eb, eb, eb + ((res==EoF()) ? 0 : res)); + return (!res || (res == EoF())) ? EoF() : *eb; + } + +@@ -435,12 +435,12 @@ private: + if (mode & PGSTD::ios::in) + { + m_G = new char_type[m_BufSize]; +- setg(m_G, m_G, m_G); ++ this->setg(m_G, m_G, m_G); + } + if (mode & PGSTD::ios::out) + { + m_P = new char_type[m_BufSize]; +- setp(m_P, m_P + m_BufSize); ++ this->setp(m_P, m_P + m_BufSize); + } + } + |