diff options
| author | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
| commit | b9c2a6f6628476f11c78a7de2adc90edca1e209e (patch) | |
| tree | df192d87dfbc594a7a2b52a96b5145ad3156d26f /cpp/src/Ice/StringConverterPlugin.cpp | |
| parent | ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1 (diff) | |
| parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
| download | ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.bz2 ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.xz ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.zip | |
Merge remote-tracking branch 'origin/3.6'
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); +} + } |