diff options
| author | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
| commit | 700eed3207129c277c245fec9fdebfa099a0f77e (patch) | |
| tree | 16dc801d327c8c9e27066f007745a09d73dbb8c0 /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | bug 4725 - generate one shot constructor for structs (diff) | |
| download | ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.bz2 ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.xz ice-700eed3207129c277c245fec9fdebfa099a0f77e.zip | |
Squashed commit of the following:
commit f25399b006e5b15b46e4258546d80e1d006e1bc1
Author: U-bwin7\bernard <bernard@bwin7.(none)>
Date: Thu May 13 11:41:01 2010 -0400
VS2010 port
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/src/Ice/ConnectionFactory.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 1c95fb35c5a..015818d7ce0 100644..100755 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -25,9 +25,7 @@ #include <Ice/LocalException.h> #include <Ice/Functional.h> #include <IceUtil/Random.h> -#ifdef __BCPLUSPLUS__ -# include <iterator> -#endif +#include <iterator> using namespace std; using namespace Ice; |