diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-05-02 19:10:56 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-05-02 19:10:56 +0000 |
| commit | 643bb663b019016db089777143d6ba7e8a4ff0ea (patch) | |
| tree | 95aecc5b75c658ae0c8abc287434f604b9eb1bd8 /cppe/src/IceE/Initialize.cpp | |
| parent | MAke wstring optional for IceE (diff) | |
| download | ice-643bb663b019016db089777143d6ba7e8a4ff0ea.tar.bz2 ice-643bb663b019016db089777143d6ba7e8a4ff0ea.tar.xz ice-643bb663b019016db089777143d6ba7e8a4ff0ea.zip | |
Make Wstring optional for IceE
Diffstat (limited to 'cppe/src/IceE/Initialize.cpp')
| -rw-r--r-- | cppe/src/IceE/Initialize.cpp | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/cppe/src/IceE/Initialize.cpp b/cppe/src/IceE/Initialize.cpp index 1062a289b6f..10094b13de9 100644 --- a/cppe/src/IceE/Initialize.cpp +++ b/cppe/src/IceE/Initialize.cpp @@ -61,22 +61,46 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[]) } PropertiesPtr -Ice::createProperties() +Ice::createProperties( +#ifdef ICEE_HAS_WSTRING + const StringConverterPtr& converter +#endif + ) { - return new Properties(); + return new Properties( +#ifdef ICEE_HAS_WSTRING + converter +#endif + ); } PropertiesPtr -Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults) +Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults +#ifdef ICEE_HAS_WSTRING + , const StringConverterPtr& converter +#endif + ) { - return new Properties(args, defaults); + return new Properties(args, defaults +#ifdef ICEE_HAS_WSTRING + , converter +#endif + ); } PropertiesPtr -Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults) +Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults +#ifdef ICEE_HAS_WSTRING + , const StringConverterPtr& converter +#endif + ) { StringSeq args = argsToStringSeq(argc, argv); - PropertiesPtr properties = createProperties(args, defaults); + PropertiesPtr properties = createProperties(args, defaults +#ifdef ICEE_HAS_WSTRING + , converter +#endif + ); stringSeqToArgs(args, argc, argv); return properties; } |