summaryrefslogtreecommitdiff
path: root/python/modules/IcePy
diff options
context:
space:
mode:
Diffstat (limited to 'python/modules/IcePy')
-rw-r--r--python/modules/IcePy/Communicator.cpp2
-rw-r--r--python/modules/IcePy/ObjectAdapter.cpp2
-rw-r--r--python/modules/IcePy/Types.cpp2
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>