summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-09-22 17:07:43 +0000
committerMarc Laukien <marc@zeroc.com>2002-09-22 17:07:43 +0000
commitee9134f129672068403f488e9a326411ca9cc1b1 (patch)
tree5bd03a07398ed4ffd2fc8d929ab4a0ce97a843a1 /cpp/src/Ice/Object.cpp
parentfixes (diff)
downloadice-ee9134f129672068403f488e9a326411ca9cc1b1.tar.bz2
ice-ee9134f129672068403f488e9a326411ca9cc1b1.tar.xz
ice-ee9134f129672068403f488e9a326411ca9cc1b1.zip
removed several static's
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index ac923c7485a..ae3a08265df 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -258,11 +258,7 @@ Ice::Object::__unmarshal(const ::Ice::StreamPtr& __is)
{
IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
- static const string facetsName = "ice:facets";
- static const string keyName = "ice:key";
- static const string valueName = "ice:value";
-
- Int sz = __is->startReadDictionary(facetsName);
+ Int sz = __is->startReadDictionary("ice::facets");
_activeFacetMap.clear();
_activeFacetMapHint = _activeFacetMap.end();
@@ -271,8 +267,8 @@ Ice::Object::__unmarshal(const ::Ice::StreamPtr& __is)
{
__is->startReadDictionaryElement();
pair<string, ObjectPtr> v;
- v.first = __is->readString(keyName);
- v.second = __is->readObject(valueName, "", 0);
+ v.first = __is->readString("ice:key");
+ v.second = __is->readObject("ice::value", "", 0);
_activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, v);
__is->endReadDictionaryElement();
}