diff options
| author | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
| commit | 1161c5817059464ab511632c0ce5d14593ced1a3 (patch) | |
| tree | 51bbcdf2a4ea43c430312157350bb4271bc3f40d /cpp/include/Ice/Initialize.h | |
| parent | Update .gitignore files (diff) | |
| download | ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.bz2 ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.xz ice-1161c5817059464ab511632c0ce5d14593ced1a3.zip | |
ICE-4851 - Use wstrings for input and output data that contain non-ASCII characters?
Diffstat (limited to 'cpp/include/Ice/Initialize.h')
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 0424731bc37..1422e0552e5 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -18,10 +18,10 @@ #include <Ice/StatsF.h> #include <Ice/InstrumentationF.h> #include <Ice/Dispatcher.h> -#include <Ice/StringConverter.h> #include <Ice/FactoryTable.h> #include <Ice/BuiltinSequences.h> #include <Ice/Version.h> +#include <Ice/Plugin.h> namespace Ice { @@ -34,8 +34,6 @@ ICE_API StringSeq argsToStringSeq(int, char*[]); ICE_API StringSeq argsToStringSeq(int, wchar_t*[]); -ICE_API StringSeq argsToStringSeq(int, wchar_t*[], const StringConverterPtr&); - #endif // @@ -46,9 +44,9 @@ ICE_API StringSeq argsToStringSeq(int, wchar_t*[], const StringConverterPtr&); // ICE_API void stringSeqToArgs(const StringSeq&, int&, char*[]); -ICE_API PropertiesPtr createProperties(const StringConverterPtr& = 0); -ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr& = 0, const StringConverterPtr& = 0); -ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr& = 0, const StringConverterPtr& = 0); +ICE_API PropertiesPtr createProperties(); +ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr& = 0); +ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr& = 0); // // This class is used to notify user of when Ice threads are started @@ -88,8 +86,6 @@ struct InitializationData LoggerPtr logger; StatsPtr stats; Instrumentation::CommunicatorObserverPtr observer; - StringConverterPtr stringConverter; - WstringConverterPtr wstringConverter; ThreadNotificationPtr threadHook; DispatcherPtr dispatcher; CompactIdResolverPtr compactIdResolver; |