diff options
Diffstat (limited to 'ruby/src/IceRuby/Init.cpp')
| -rw-r--r-- | ruby/src/IceRuby/Init.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/ruby/src/IceRuby/Init.cpp b/ruby/src/IceRuby/Init.cpp index 6a3768205ff..a70dd421691 100644 --- a/ruby/src/IceRuby/Init.cpp +++ b/ruby/src/IceRuby/Init.cpp @@ -17,6 +17,9 @@ #include <Types.h> #include <Connection.h> #include <Endpoint.h> +#include <ValueFactoryManager.h> + +#include <Ice/RegisterPlugins.h> using namespace std; using namespace IceRuby; @@ -26,21 +29,12 @@ static VALUE iceModule; extern "C" { -#ifdef ICE_STATIC_LIBS -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); -Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -Ice::Plugin* createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -#endif - void ICE_DECLSPEC_EXPORT Init_IceRuby() { -#ifdef ICE_STATIC_LIBS - // Register the plugins manually if we're building with static libraries. - Ice::registerPluginFactory("IceSSL", createIceSSL, false); - Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false); - Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false); -#endif + Ice::registerIceSSL(false); + Ice::registerIceDiscovery(false); + Ice::registerIceLocatorDiscovery(false); iceModule = rb_define_module("Ice"); initCommunicator(iceModule); @@ -54,6 +48,7 @@ ICE_DECLSPEC_EXPORT Init_IceRuby() initUtil(iceModule); initConnection(iceModule); initEndpoint(iceModule); + initValueFactoryManager(iceModule); } } |