diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-08 05:10:13 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-08 05:10:13 +0000 |
| commit | 353add91960fa4f133bd2db69a11f7efa1ced160 (patch) | |
| tree | bed068f5c9b04488ddbaa48eb9b58283232d78bf /cpp/src/Ice/PropertiesI.h | |
| parent | *** empty log message *** (diff) | |
| download | ice-353add91960fa4f133bd2db69a11f7efa1ced160.tar.bz2 ice-353add91960fa4f133bd2db69a11f7efa1ced160.tar.xz ice-353add91960fa4f133bd2db69a11f7efa1ced160.zip | |
Fix for bugs #1015 and #542 (default properties)
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index 603e1bc2a24..0a8a5622daa 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -33,14 +33,14 @@ public: virtual PropertiesPtr clone(); private: - - PropertiesI(const PropertiesI*); PropertiesI(); - PropertiesI(StringSeq&); + PropertiesI(StringSeq&, const PropertiesPtr&); + PropertiesI(const PropertiesI*); friend ICE_API PropertiesPtr createProperties(); - friend ICE_API PropertiesPtr createProperties(StringSeq&); - friend ICE_API PropertiesPtr createProperties(int&, char*[]); + friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&); + friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&); + void parseLine(const std::string&); |