summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesI.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-08-05 16:13:47 -0400
committerBernard Normier <bernard@zeroc.com>2016-08-05 16:13:47 -0400
commit71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f (patch)
tree188156deff284e60491e816af1c2ba06195d0474 /cpp/src/Ice/PropertiesI.h
parentFixed type ID for well-known locator registry object (diff)
downloadice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.tar.bz2
ice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.tar.xz
ice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.zip
Reduced string converter caching
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
-rw-r--r--cpp/src/Ice/PropertiesI.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index cbaaaa5e9a6..9b738c7927c 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -19,8 +19,7 @@
namespace Ice
{
-class PropertiesI : public Properties,
- public IceUtil::Mutex
+class PropertiesI : public Properties, public IceUtil::Mutex
{
public:
@@ -42,15 +41,11 @@ public:
std::set<std::string> getUnusedProperties();
PropertiesI(const PropertiesI*);
-
-private:
- PropertiesI(const StringConverterPtr&);
- PropertiesI(StringSeq&, const PropertiesPtr&, const StringConverterPtr&);
+ PropertiesI();
+ PropertiesI(StringSeq&, const PropertiesPtr&);
- friend ICE_API PropertiesPtr createProperties();
- friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&);
- friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&);
+private:
void parseLine(const std::string&, const StringConverterPtr&);
@@ -73,7 +68,6 @@ private:
bool used;
};
std::map<std::string, PropertyValue> _properties;
- const StringConverterPtr _converter;
};
}