diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-09-21 14:17:53 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-09-21 14:17:53 -0400 |
| commit | 1c9dbfa25dbdebe1479461449ce4fb1317450c76 (patch) | |
| tree | 7aada155f9f92214aa657059b58a5db5548fc088 /python/modules | |
| parent | Merge branch '3.7.1-xcode10' into 3.7 (diff) | |
| parent | PyThread_get_thread_ident returns unsigned long in Python 3.7 and long in old... (diff) | |
| download | ice-1c9dbfa25dbdebe1479461449ce4fb1317450c76.tar.bz2 ice-1c9dbfa25dbdebe1479461449ce4fb1317450c76.tar.xz ice-1c9dbfa25dbdebe1479461449ce4fb1317450c76.zip | |
Merge branch '3.7.1-xcode10' into 3.7
Diffstat (limited to 'python/modules')
| -rw-r--r-- | python/modules/IcePy/Communicator.cpp | 4 | ||||
| -rw-r--r-- | python/modules/IcePy/ObjectAdapter.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index 559a46097c6..df6af7330a1 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -39,7 +39,11 @@ using namespace std; using namespace IcePy; +#if PY_VERSION_HEX < 0x03070000 +static long _mainThreadId; +#else static unsigned long _mainThreadId; +#endif typedef map<Ice::CommunicatorPtr, PyObject*> CommunicatorMap; static CommunicatorMap _communicatorMap; diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index 74775100df4..ec06cce6961 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -31,7 +31,11 @@ using namespace std; using namespace IcePy; +#if PY_VERSION_HEX < 0x03070000 +static long _mainThreadId; +#else static unsigned long _mainThreadId; +#endif namespace IcePy { |