diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-06-14 15:21:28 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-06-14 15:21:28 +0000 |
| commit | 5fd82af799b04cf3e38bbb69a2f8fff14f951fca (patch) | |
| tree | 994849b82bfc0e0a362a8dcd9e68fbeca48e1943 /cpp/src/Ice/PropertiesI.h | |
| parent | minor changes to test harness (diff) | |
| download | ice-5fd82af799b04cf3e38bbb69a2f8fff14f951fca.tar.bz2 ice-5fd82af799b04cf3e38bbb69a2f8fff14f951fca.tar.xz ice-5fd82af799b04cf3e38bbb69a2f8fff14f951fca.zip | |
Bug 923 - read config as UTF8 and convert using string converter
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index 0a8a5622daa..ce94d4dc25f 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -12,6 +12,7 @@ #include <IceUtil/Mutex.h> #include <Ice/Properties.h> +#include <Ice/StringConverter.h> namespace Ice { @@ -33,20 +34,21 @@ public: virtual PropertiesPtr clone(); private: - PropertiesI(); - PropertiesI(StringSeq&, const PropertiesPtr&); + PropertiesI(const StringConverterPtr&); + PropertiesI(StringSeq&, const PropertiesPtr&, const StringConverterPtr&); PropertiesI(const PropertiesI*); - friend ICE_API PropertiesPtr createProperties(); - friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&); - friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&); + friend ICE_API PropertiesPtr createProperties(const StringConverterPtr&); + friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&, const StringConverterPtr&); + friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&, const StringConverterPtr&); - void parseLine(const std::string&); + void parseLine(const std::string&, const StringConverterPtr&); void loadConfig(); std::map<std::string, std::string> _properties; + const StringConverterPtr _converter; }; } |