Changeset 9110 in webkit for trunk/JavaScriptCore/bindings/runtime_root.h

Timestamp:

May 4, 2005, 5:07:02 PM (20 years ago)

Author:

darin

Message:

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.

File:

• trunk/JavaScriptCore/bindings/runtime_root.h (modified) (4 diffs)

trunk/JavaScriptCore/bindings/runtime_root.h

@@ -39 +39 @@
 
 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);
 
@@ -58 +58 @@
     }
     
-    void setRootObjectImp (KJS::ObjectImp *i) { 
+    void setRootObjectImp (ObjectImp *i) { 
         _imp = i;
 #if !USE_CONSERVATIVE_GC
@@ -69 +69 @@
     }
     
-    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 ();
@@ -92 +92 @@
 private:
     const void *_nativeHandle;
-    KJS::ObjectImp *_imp;
-    KJS::Interpreter *_interpreter;
+    ObjectImp *_imp;
+    Interpreter *_interpreter;
 
     static FindRootObjectForNativeHandleFunctionPtr _findRootObjectForNativeHandleFunctionPtr;