summaryrefslogtreecommitdiff
path: root/databases/postgresql-libpqxx3/files/patch-svn_1833
blob: 5c51da50f243353a9daec7c5ec2a1ffbf2ff0afe (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
--- ChangeLog.orig	2013-01-17 07:25:02 UTC
+++ ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Jeroen T. Vermeulen <jtv@xs4all.nl>
+ include/pqxx/largeobject.hxx:
+ - Backported fix for #252: clang++ 3.2 compile error.  Thanks Amy Troschinetz.
+ src/strconv.cxx:
+ - Backported fix for #253: clang++ 3.2 compile error.  Thanks Amy Troschinetz.
 2013-01-17  Jeroen T. Vermeulen <jtv@xs4all.nl>
  tools/splitconfig:
  - Rewrote in python.
--- include/pqxx/largeobject.hxx.orig	2013-01-17 07:25:00 UTC
+++ include/pqxx/largeobject.hxx
@@ -396,7 +396,7 @@ public:
 			openmode mode = PGSTD::ios::in | PGSTD::ios::out,
 			size_type BufSize=512) :			//[t48]
     m_BufSize(BufSize),
-    m_Obj(T, O),
+    m_Obj(T, O, mode),
     m_G(0),
     m_P(0)
 	{ initialize(mode); }
@@ -406,7 +406,7 @@ public:
 			openmode mode = PGSTD::ios::in | PGSTD::ios::out,
 			size_type BufSize=512) :			//[t48]
     m_BufSize(BufSize),
-    m_Obj(T, O),
+    m_Obj(T, O, mode),
     m_G(0),
     m_P(0)
 	{ initialize(mode); }
--- src/strconv.cxx.orig	2013-01-17 07:25:01 UTC
+++ src/strconv.cxx
@@ -6,7 +6,7 @@
  *   DESCRIPTION
  *      implementation of string conversions
  *
- * Copyright (c) 2008, Jeroen T. Vermeulen <jtv@xs4all.nl>
+ * Copyright (c) 2008-2012, Jeroen T. Vermeulen <jtv@xs4all.nl>
  *
  * See COPYING for copyright license.  If you did not receive a file called
  * COPYING with this source code, please notify the distributor of this mistake,
@@ -230,7 +230,7 @@ template<typename T> inline void from_st
 #if defined(PQXX_HAVE_IMBUE)
       S.imbue(locale("C"));
 #endif
-      ok = (S >> result);
+      ok = static_cast<bool>(S >> result);
     }
     break;
   }