diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
| commit | c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 (patch) | |
| tree | 5cb64dfe155e5d2349efb6c7dc4b0f5b5284d44a /cpp/src/IceDiscovery | |
| parent | Fix Windows php build to restore nuget packages (diff) | |
| download | ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.bz2 ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.xz ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.zip | |
Refactored SSL and iAP transports, support for running SSL on top
of TCP/iAP/Bluetooth.
Diffstat (limited to 'cpp/src/IceDiscovery')
| -rw-r--r-- | cpp/src/IceDiscovery/PluginI.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 5360dc14d31..615e0eeec96 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -28,17 +28,12 @@ using namespace IceDiscovery; // // Plugin factory function. // -extern "C" -{ - -ICE_DISCOVERY_API Ice::Plugin* +extern "C" ICE_DISCOVERY_API Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&) { return new PluginI(communicator); } -} - namespace Ice { @@ -50,6 +45,15 @@ registerIceDiscovery(bool loadOnInitialize) } +// +// Objective-C function to allow Objective-C programs to register plugin. +// +extern "C" ICE_DISCOVERY_API void +ICEregisterIceDiscovery(bool loadOnInitialize) +{ + Ice::registerIceDiscovery(loadOnInitialize); +} + PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator) { } |