Got rid of StaticRecMutex.

1 files changed, 24 insertions, 18 deletions

diff --git a/cpp/src/IceUtil/GC.cpp b/cpp/src/IceUtil/GC.cpp
index 693da31a61c..9182bcecbcf 100644
--- a/cpp/src/IceUtil/GC.cpp
+++ b/cpp/src/IceUtil/GC.cpp
@@ -14,9 +14,31 @@
 
 #include <IceUtil/GC.h>
 #include <IceUtil/Time.h>
-#include <IceUtil/StaticRecMutex.h>
+#include <IceUtil/ObjectBase.h>
 #include <map>
 
+
+namespace IceUtil
+{
+
+void
+recursivelyReachable(ObjectBase* p, ObjectSet& o)
+{
+    if(o.find(p) == o.end())
+    {
+	assert(p);
+	o.insert(p);
+	ObjectMultiSet tmp;
+	p->__gcReachable(tmp);
+	for(ObjectMultiSet::const_iterator i = tmp.begin(); i != tmp.end(); ++i)
+	{
+	    recursivelyReachable(*i, o);
+	}
+    }
+}
+
+}
+
 using namespace std;
 
 int IceUtil::GC::_numCollectors = 0;
@@ -114,7 +136,7 @@ IceUtil::GC::collectGarbage()
 
     GCStats stats;
 
-    StaticRecMutex::Lock sync(gcMutex);
+    RecMutex::Lock sync(*gcRecMutex._m);
 
     if(_statsCallback)
     {
@@ -207,19 +229,3 @@ IceUtil::GC::collectGarbage()
 	_collecting = false;
     }
 }
-
-void
-IceUtil::GC::recursivelyReachable(ObjectBase* p, ObjectSet& o)
-{
-    if(o.find(p) == o.end())
-    {
-	assert(p);
-	o.insert(p);
-	ObjectMultiSet tmp;
-	p->__gcReachable(tmp);
-	for(ObjectMultiSet::const_iterator i = tmp.begin(); i != tmp.end(); ++i)
-	{
-	    recursivelyReachable(*i, o);
-	}
-    }
-}