diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
| commit | 1e5843ba8400c617997e81735a9f84ac2e12bb0a (patch) | |
| tree | ac82b96476e9c161d5a2b91bfc14ec8224d823ec /cpp/src/Ice/StringConverterPlugin.cpp | |
| parent | ICE-6163 - Improve error handling in test scripts (diff) | |
| download | ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.bz2 ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.xz ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.zip | |
Fixed ICE-6671 - Added registration functions to explicitly register Ice plugins
Diffstat (limited to 'cpp/src/Ice/StringConverterPlugin.cpp')
| -rw-r--r-- | cpp/src/Ice/StringConverterPlugin.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp index 2c81e800234..84775e5ad80 100644 --- a/cpp/src/Ice/StringConverterPlugin.cpp +++ b/cpp/src/Ice/StringConverterPlugin.cpp @@ -63,7 +63,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } - + if(cp == -1) { Error out(communicator->getLogger()); @@ -100,7 +100,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } - + switch(iconvArgs.size()) { case 0: @@ -125,7 +125,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c } } -#endif +#endif return new StringConverterPlugin(communicator, stringConverter, wstringConverter); } @@ -142,4 +142,16 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } + +} + +namespace Ice +{ + +ICE_API void +registerIceStringConverter(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceStringConverter", createStringConverter, loadOnInitialize); +} + } |