diff options
author | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
commit | 3e685a12bfd92a4ffd86c808ba0f34df907de5c8 (patch) | |
tree | 2ef8fb8e028d4f14d1516a98f2a18dbadb46a5d7 /cpp/src/IceBox/ServiceManagerI.cpp | |
parent | Update to latest gradle builder (diff) | |
parent | AIX port (diff) | |
download | ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.bz2 ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.xz ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 31f176bd46f..e7b4a7fac99 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -670,6 +670,11 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // // Invoke the factory function. // +#ifdef __IBMCPP__ + // xlC warns when casting a void* to function pointer +# pragma report(disable, "1540-0216") +#endif + SERVICE_FACTORY factory = reinterpret_cast<SERVICE_FACTORY>(sym); try { |