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/Slice/PythonUtil.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/Slice/PythonUtil.cpp')
-rwxr-xr-x[-rw-r--r--] | cpp/src/Slice/PythonUtil.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index e00e869c3a5..8a9d96da270 100644..100755 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -14,9 +14,7 @@ #include <IceUtil/StringUtil.h> #include <IceUtil/InputUtil.h> #include <climits> -#ifdef __BCPLUSPLUS__ -# include <iterator> -#endif +#include <iterator> using namespace std; using namespace Slice; |