summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Object.cpp7
-rw-r--r--cpp/src/Ice/Reference.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index e2458e9ac89..a0ec4de0eef 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -28,6 +28,11 @@ Ice::LocationForward::LocationForward(const ObjectPrx& p) :
{
}
+Ice::Object::Object() :
+ _activeFacetMapHint(_activeFacetMap.end())
+{
+}
+
bool
Ice::Object::_isA(const string& s)
{
@@ -138,7 +143,7 @@ Ice::Object::_removeFacet(const string& name)
}
void
-Ice::Object::_removeAllFacets(const string& name)
+Ice::Object::_removeAllFacets()
{
JTCSyncT<JTCMutex> sync(_activeFacetMapMutex);
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 5fbc4d52ad6..172ff995567 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -24,7 +24,7 @@ IceInternal::Reference::Reference(const InstancePtr& inst, const string& ident,
const vector<EndpointPtr>& origEndpts, const vector<EndpointPtr>& endpts) :
instance(inst),
identity(ident),
- facet(facet),
+ facet(fac),
mode(md),
secure(sec),
origEndpoints(origEndpts),