diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-09-21 11:39:58 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-09-21 11:39:58 -0400 |
| commit | c42bbdd3aea7b352676a1faa394b67132631784f (patch) | |
| tree | 1ade92ee921d59587b16f19a65d8279768d1b2c7 /python/modules/IcePy | |
| parent | Test using Value as operation parameter (diff) | |
| parent | More fixes for Xcode 10 (diff) | |
| download | ice-c42bbdd3aea7b352676a1faa394b67132631784f.tar.bz2 ice-c42bbdd3aea7b352676a1faa394b67132631784f.tar.xz ice-c42bbdd3aea7b352676a1faa394b67132631784f.zip | |
Merge branch '3.7.1-xcode10' into 3.7
Diffstat (limited to 'python/modules/IcePy')
| -rw-r--r-- | python/modules/IcePy/Communicator.cpp | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/ObjectAdapter.cpp | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/Types.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index 52e25a20059..559a46097c6 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -39,7 +39,7 @@ using namespace std; using namespace IcePy; -static long _mainThreadId; +static unsigned long _mainThreadId; typedef map<Ice::CommunicatorPtr, PyObject*> CommunicatorMap; static CommunicatorMap _communicatorMap; diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index 2f974e0dc46..74775100df4 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -31,7 +31,7 @@ using namespace std; using namespace IcePy; -static long _mainThreadId; +static unsigned long _mainThreadId; namespace IcePy { diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp index 9082e7ed783..753e45b514b 100644 --- a/python/modules/IcePy/Types.cpp +++ b/python/modules/IcePy/Types.cpp @@ -22,6 +22,8 @@ #include <Ice/OutputStream.h> #include <Ice/SlicedData.h> +#include <IceUtil/DisableWarnings.h> + #include <list> #include <limits> |