From 66564b49d676387f544893408c97acbe2252e602 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 9 Oct 2014 19:55:40 -0400
Subject: Fixed ICE-5726: provide deprecated public StringConverterPlugin

---
 cpp/src/Ice/DeprecatedStringConverter.cpp | 32 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/DeprecatedStringConverter.cpp')

diff --git a/cpp/src/Ice/DeprecatedStringConverter.cpp b/cpp/src/Ice/DeprecatedStringConverter.cpp
index fd87c2f7e86..308607c54ea 100644
--- a/cpp/src/Ice/DeprecatedStringConverter.cpp
+++ b/cpp/src/Ice/DeprecatedStringConverter.cpp
@@ -10,27 +10,51 @@
 #include <Ice/DeprecatedStringConverter.h>
 #include <Ice/Initialize.h>
 #include <Ice/Instance.h>
+#include <IceUtil/StringConverter.h>
+
+namespace Ice
+{
+
+StringConverterPlugin::StringConverterPlugin(const CommunicatorPtr& /*notused*/, 
+                                             const StringConverterPtr& stringConverter, 
+                                             const WstringConverterPtr& wstringConverter) 
+{
+    IceUtil::setProcessStringConverter(stringConverter);
+    IceUtil::setProcessWstringConverter(wstringConverter);
+}
+    
+void StringConverterPlugin::initialize()
+{
+    // no op
+}
+    
+void StringConverterPlugin::destroy()
+{
+    // no op
+}
 
 std::string
-Ice::nativeToUTF8(const Ice::StringConverterPtr& converter, const std::string& s)
+nativeToUTF8(const StringConverterPtr& converter, const std::string& s)
 {
     return IceUtil::nativeToUTF8(s, converter);
 }
 
 std::string
-Ice::nativeToUTF8(const Ice::CommunicatorPtr& communicator, const std::string& s)
+nativeToUTF8(const CommunicatorPtr& communicator, const std::string& s)
 {
     return IceUtil::nativeToUTF8(s, IceInternal::getInstance(communicator)->getStringConverter());
 }
 
 std::string
-Ice::UTF8toNative(const Ice::StringConverterPtr& converter, const std::string& s)
+UTF8toNative(const StringConverterPtr& converter, const std::string& s)
 {
     return IceUtil::UTF8ToNative(s, converter);
 }
 
 std::string
-Ice::UTF8ToNative(const Ice::CommunicatorPtr& communicator, const std::string& s)
+UTF8ToNative(const CommunicatorPtr& communicator, const std::string& s)
 {
     return IceUtil::UTF8ToNative(s, IceInternal::getInstance(communicator)->getStringConverter());
 }
+
+}
-- 
cgit v1.2.3