Reviewed by Dave Hyatt.

        - another gcc-4.0-related fix

        * bindings/runtime_root.h: Take off extra namespace prefixes that apparently cause problems
        compiling with gcc 4.0, although I have not observed the problems.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2027d37f3e05ad48f38a3d1589952949f6be04a8..71d38e644917a4939f210b4379c3a95e3c2e6e1b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-04  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - another gcc-4.0-related fix
+
+        * bindings/runtime_root.h: Take off extra namespace prefixes that apparently cause problems
+        compiling with gcc 4.0, although I have not observed the problems.
+
 2005-05-04  Darin Adler  <darin@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/JavaScriptCore/bindings/runtime_root.h b/JavaScriptCore/bindings/runtime_root.h
index bbfb828072afdee84d6e9e9d5f452e2487f30e4a..0f506bb80b940ddaa4e7c79f8508f7df4dc91aac 100644 (file)
--- a/JavaScriptCore/bindings/runtime_root.h
+++ b/JavaScriptCore/bindings/runtime_root.h
@@ -38,9 +38,9 @@ class RootObject;
 typedef RootObject *(*FindRootObjectForNativeHandleFunctionPtr)(void *);
 
 extern CFMutableDictionaryRef findReferenceDictionary(ObjectImp *imp);
-extern const Bindings::RootObject *rootForImp (ObjectImp *imp);
-extern const Bindings::RootObject *KJS::Bindings::rootForInterpreter (KJS::Interpreter *interpreter);
-extern void addNativeReference (const Bindings::RootObject *root, ObjectImp *imp);
+extern const RootObject *rootForImp (ObjectImp *imp);
+extern const RootObject *rootForInterpreter (Interpreter *interpreter);
+extern void addNativeReference (const RootObject *root, ObjectImp *imp);
 extern void removeNativeReference (ObjectImp *imp);
 
 class RootObject
@@ -57,7 +57,7 @@ public:
 #endif
     }
     
-    void setRootObjectImp (KJS::ObjectImp *i) { 
+    void setRootObjectImp (ObjectImp *i) { 
         _imp = i;
 #if !USE_CONSERVATIVE_GC
         _imp->ref();
@@ -68,10 +68,10 @@ public:
 #endif
     }
     
-    KJS::ObjectImp *rootObjectImp() const { return _imp; }
+    ObjectImp *rootObjectImp() const { return _imp; }
     
-    void setInterpreter (KJS::Interpreter *i);
-    KJS::Interpreter *interpreter() const { return _interpreter; }
+    void setInterpreter (Interpreter *i);
+    Interpreter *interpreter() const { return _interpreter; }
 
     void removeAllNativeReferences ();
 
@@ -91,8 +91,8 @@ public:
 
 private:
     const void *_nativeHandle;
-    KJS::ObjectImp *_imp;
-    KJS::Interpreter *_interpreter;
+    ObjectImp *_imp;
+    Interpreter *_interpreter;
 
     static FindRootObjectForNativeHandleFunctionPtr _findRootObjectForNativeHandleFunctionPtr;
     static CFRunLoopRef _runLoop;