diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-27 13:05:25 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-27 13:05:25 +0200 |
| commit | c5ee6fd5310199110dae6b2d01decbd20174d8db (patch) | |
| tree | daf558482821eb3a1ffd496b06ba8bcc2edce841 /cpp/src/Ice/RegisterPluginsInit.cpp | |
| parent | Extra whitespace (diff) | |
| download | ice-c5ee6fd5310199110dae6b2d01decbd20174d8db.tar.bz2 ice-c5ee6fd5310199110dae6b2d01decbd20174d8db.tar.xz ice-c5ee6fd5310199110dae6b2d01decbd20174d8db.zip | |
Fixed ICE-6680 - WS transports are now provided by a separate IceWS plugin
Diffstat (limited to 'cpp/src/Ice/RegisterPluginsInit.cpp')
| -rw-r--r-- | cpp/src/Ice/RegisterPluginsInit.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp index f0fac12f972..47c7a00c81c 100644 --- a/cpp/src/Ice/RegisterPluginsInit.cpp +++ b/cpp/src/Ice/RegisterPluginsInit.cpp @@ -16,11 +16,19 @@ extern "C" Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); +Ice::Plugin* createIceWS(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); }; IceInternal::RegisterPluginsInit::RegisterPluginsInit() { - Ice::registerPluginFactory("IceUDP", createIceUDP, true); Ice::registerPluginFactory("IceTCP", createIceTCP, true); + + // + // Only include the UDP and WS transport plugins with non-static builds or Gem/PyPI builds. + // +#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI) + Ice::registerPluginFactory("IceUDP", createIceUDP, true); + Ice::registerPluginFactory("IceWS", createIceWS, true); +#endif } |