diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/src/Ice/PropertiesI.h | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index 592c564ed05..cbaaaa5e9a6 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -12,7 +12,7 @@ #include <IceUtil/Mutex.h> #include <Ice/Properties.h> -#include <IceUtil/StringConverter.h> +#include <Ice/StringConverter.h> #include <set> @@ -44,14 +44,15 @@ public: PropertiesI(const PropertiesI*); private: - PropertiesI(const IceUtil::StringConverterPtr&); - PropertiesI(StringSeq&, const PropertiesPtr&, const IceUtil::StringConverterPtr&); + + PropertiesI(const StringConverterPtr&); + PropertiesI(StringSeq&, const PropertiesPtr&, const StringConverterPtr&); friend ICE_API PropertiesPtr createProperties(); friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&); friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&); - void parseLine(const std::string&, const IceUtil::StringConverterPtr&); + void parseLine(const std::string&, const StringConverterPtr&); void loadConfig(); @@ -72,7 +73,7 @@ private: bool used; }; std::map<std::string, PropertyValue> _properties; - const IceUtil::StringConverterPtr _converter; + const StringConverterPtr _converter; }; } |