* src/vm/linker.cpp, src/vm/linker.hpp: Repaired C++ usage of

linker_classrenumber_mutex.

--HG--
branch : subtype-trunk

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index 701fc4db0d2c0dc5b37ab694bfaa1bafa23c4a05..f0acadb17b6a50c26f409a632b33f5c093396acc 100644 (file)
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -95,7 +95,7 @@ static s4 interfaceindex;       /* sequential numbering of interfaces         */
 static s4 classvalue;
 
 #if !USES_NEW_SUBTYPE
-java_object_t *linker_classrenumber_lock;
+Mutex *linker_classrenumber_lock;
 #endif
 
 #if defined(__cplusplus)
@@ -128,11 +128,9 @@ void linker_preinit(void)
        interfaceindex = 0;
 
 #if defined(ENABLE_THREADS) && !USES_NEW_SUBTYPE
-       /* create the global lock object */
+       /* create the global mutex */
 
-       linker_classrenumber_lock = NEW(java_object_t);
-
-       LOCK_INIT_OBJECT_LOCK(linker_classrenumber_lock);
+       linker_classrenumber_lock = new Mutex();
 #endif
 
        /* Link the most basic classes. */

diff --git a/src/vm/linker.hpp b/src/vm/linker.hpp
index 10355d0a6096bb499702303d9f51d78727d28a65..2142ef8935b0a4ea9f80fc75f0b441b884536ea6 100644 (file)
--- a/src/vm/linker.hpp
+++ b/src/vm/linker.hpp
@@ -72,10 +72,10 @@ struct arraydescriptor {
 #define UNLOCK_CLASSRENUMBER_LOCK /* nothing */
 
 #else
-extern java_object_t *linker_classrenumber_lock;
+extern Mutex *linker_classrenumber_lock;
 
-#define LOCK_CLASSRENUMBER_LOCK   LOCK_MONITOR_ENTER(linker_classrenumber_lock)
-#define UNLOCK_CLASSRENUMBER_LOCK LOCK_MONITOR_EXIT(linker_classrenumber_lock)
+#define LOCK_CLASSRENUMBER_LOCK   linker_classrenumber_lock->lock()
+#define UNLOCK_CLASSRENUMBER_LOCK linker_classrenumber_lock->unlock()
 
 #endif