1 From ecb9147b36cdd7ed72af555556ae7c34df542b36 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
3 Date: Tue, 29 May 2012 12:35:23 +0200
4 Subject: [PATCH 2/9] gcc46 fix
7 cpp/include/Freeze/Map.h | 2 +-
8 cpp/include/Ice/Buffer.h | 2 ++
9 cpp/src/Ice/ConnectionFactory.cpp | 1 +
10 cpp/src/Ice/ConnectionI.cpp | 1 +
11 cpp/src/Ice/Reference.cpp | 2 +-
12 cpp/src/IceGrid/Util.h | 1 +
13 cpp/src/slice2freeze/Main.cpp | 1 +
14 cpp/test/Ice/binding/AllTests.cpp | 2 +-
15 8 files changed, 9 insertions(+), 3 deletions(-)
17 diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
18 index 2ec759d..d8ef692 100644
19 --- a/cpp/include/Freeze/Map.h
20 +++ b/cpp/include/Freeze/Map.h
22 #include <Freeze/DB.h>
23 #include <Freeze/Exception.h>
24 #include <Freeze/Connection.h>
28 // Berkeley DB's DbEnv
30 diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
31 index 6f7ebab..9501f08 100644
32 --- a/cpp/include/Ice/Buffer.h
33 +++ b/cpp/include/Ice/Buffer.h
36 #include <Ice/Config.h>
43 diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
44 index ee201fd..c5cfae1 100644
45 --- a/cpp/src/Ice/ConnectionFactory.cpp
46 +++ b/cpp/src/Ice/ConnectionFactory.cpp
48 #include <Ice/Functional.h>
49 #include <IceUtil/Random.h>
55 diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
56 index 2d942ca..a864509 100644
57 --- a/cpp/src/Ice/ConnectionI.cpp
58 +++ b/cpp/src/Ice/ConnectionI.cpp
60 #include <Ice/ReferenceFactory.h> // For createProxy().
61 #include <Ice/ProxyFactory.h> // For createProxy().
67 diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
68 index 875b64e..6f84069 100644
69 --- a/cpp/src/Ice/Reference.cpp
70 +++ b/cpp/src/Ice/Reference.cpp
72 #include <IceUtil/StringUtil.h>
73 #include <IceUtil/Random.h>
74 #include <IceUtil/MutexPtrLock.h>
80 diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
81 index 72ffded..0047e57 100644
82 --- a/cpp/src/IceGrid/Util.h
83 +++ b/cpp/src/IceGrid/Util.h
85 #include <IceUtil/Random.h>
92 diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
93 index 7e2afb2..af68a7d 100644
94 --- a/cpp/src/slice2freeze/Main.cpp
95 +++ b/cpp/src/slice2freeze/Main.cpp
97 #include <IceUtil/OutputUtil.h>
98 #include <IceUtil/StringUtil.h>
103 using namespace IceUtil;
104 diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
105 index f4da896..912aed1 100644
106 --- a/cpp/test/Ice/binding/AllTests.cpp
107 +++ b/cpp/test/Ice/binding/AllTests.cpp
109 #include <TestCommon.h>
114 #include <functional>