diff options
| author | Jose <jose@zeroc.com> | 2017-07-12 13:51:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-12 13:51:42 +0200 |
| commit | 981ba75dafe0e95931b1a20a34cf3d08432dbd1f (patch) | |
| tree | 00a90c3922a5b19acfcbc41320ee57242f780add /python/modules | |
| parent | IceGridGUI - Fix fallback class name (diff) | |
| download | ice-981ba75dafe0e95931b1a20a34cf3d08432dbd1f.tar.bz2 ice-981ba75dafe0e95931b1a20a34cf3d08432dbd1f.tar.xz ice-981ba75dafe0e95931b1a20a34cf3d08432dbd1f.zip | |
ICE-8279 - Operation.cpp/Connection.cpp warnings when building PyPI wheel on Windows
Diffstat (limited to 'python/modules')
| -rw-r--r-- | python/modules/IcePy/Connection.cpp | 6 | ||||
| -rw-r--r-- | python/modules/IcePy/Operation.cpp | 4 | ||||
| -rw-r--r-- | python/modules/IcePy/msbuild/icepy.vcxproj | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/python/modules/IcePy/Connection.cpp b/python/modules/IcePy/Connection.cpp index af48ede2e53..2a0c5338bb1 100644 --- a/python/modules/IcePy/Connection.cpp +++ b/python/modules/IcePy/Connection.cpp @@ -31,6 +31,11 @@ namespace // P = sizeof(void*), L = sizeof(long) template<int P, int L> struct Hasher; +#ifndef _WIN64 +// +// COMPILERFIX: With Windows 64 the templates bellow will produce trucation warnings, +// we ifdef them out as they are never used with Windows 64. +// template<> struct Hasher<4, 4> { @@ -48,6 +53,7 @@ struct Hasher<8, 8> return reinterpret_cast<long>(ptr); } }; +#endif template<> struct Hasher<8, 4> diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index 25f580c24d3..169f554766a 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -3890,7 +3890,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con ParamInfoPtr info = *p; if(!info->optional) { - void* closure = reinterpret_cast<void*>(info->pos); + void* closure = reinterpret_cast<void*>(static_cast<Py_ssize_t>(info->pos)); info->type->unmarshal(&is, info, args.get(), closure, false, &info->metaData); } } @@ -3903,7 +3903,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con ParamInfoPtr info = *p; if(is.readOptional(info->tag, info->type->optionalFormat())) { - void* closure = reinterpret_cast<void*>(info->pos); + void* closure = reinterpret_cast<void*>(static_cast<Py_ssize_t>(info->pos)); info->type->unmarshal(&is, info, args.get(), closure, true, &info->metaData); } else diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj index 760d6118431..0488742e3b0 100644 --- a/python/modules/IcePy/msbuild/icepy.vcxproj +++ b/python/modules/IcePy/msbuild/icepy.vcxproj @@ -150,17 +150,11 @@ <TargetExt>.pyd</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <DisableSpecificWarnings>4302;4311;4312;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> <Link> <ImportLibrary /> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <DisableSpecificWarnings>4302;4311;4312;%(DisableSpecificWarnings)</DisableSpecificWarnings> - </ClCompile> <Link> <ImportLibrary /> </Link> |