Remove JSTreeContext/TokenStream warnings (no bug, r=me)
authorLuke Wagner <lw@mozilla.com>
Thu, 01 Apr 2010 12:41:01 -0700
changeset 40433 23d28870491610028798de565bfcd45b70bc835c
parent 40432 2aad6cddf9454ca752a9d72ea37e4ac31d5bc988
child 40434 e89b17df09aa176695ab6aa4e9ab60a164d3ad60
push id12610
push userrsayre@mozilla.com
push dateMon, 05 Apr 2010 17:26:41 +0000
treeherdermozilla-central@1942c0b4e101 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
milestone1.9.3a4pre
Remove JSTreeContext/TokenStream warnings (no bug, r=me)
js/src/jsparse.h
js/src/jsprvtd.h
--- a/js/src/jsparse.h
+++ b/js/src/jsparse.h
@@ -903,18 +903,16 @@ struct JSFunctionBoxQueue {
         JSFunctionBox *funbox = vector[tail++ & lengthMask];
         funbox->queued = false;
         return funbox;
     }
 };
 
 #define NUM_TEMP_FREELISTS      6U      /* 32 to 2048 byte size classes (32 bit) */
 
-class JSTreeContext;
-
 typedef struct BindData BindData;
 
 struct JSCompiler : private js::AutoGCRooter {
     JSContext           * const context; /* FIXME Bug 551291: use AutoGCRooter::context? */
     JSAtomListElement   *aleFreeList;
     void                *tempFreeList[NUM_TEMP_FREELISTS];
     js::TokenStream     tokenStream;
     void                *tempPoolMark;  /* initial JSContext.tempPool mark */
@@ -935,17 +933,17 @@ struct JSCompiler : private js::AutoGCRo
         js::PodArrayZero(tempFreeList);
         setPrincipals(prin);
         JS_ASSERT_IF(cfp, cfp->script);
     }
 
     ~JSCompiler();
 
     friend void js::AutoGCRooter::trace(JSTracer *trc);
-    friend class JSTreeContext;
+    friend struct JSTreeContext;
 
     /*
      * Initialize a compiler. Parameters are passed on to init tokenStream.
      * The compiler owns the arena pool "tops-of-stack" space above the current
      * JSContext.tempPool mark. This means you cannot allocate from tempPool
      * and save the pointer beyond the next JSCompiler destructor invocation.
      */
     bool init(const jschar *base, size_t length,
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -139,17 +139,17 @@ typedef struct JSXMLArrayCursor     JSXM
 extern "C++" {
 
 namespace js {
 
 class TraceRecorder;
 struct TraceMonitor;
 class CallStack;
 
-struct TokenStream;
+class TokenStream;
 struct Token;
 struct TokenPos;
 struct TokenPtr;
 
 class ContextAllocPolicy;
 class SystemAllocPolicy;
 
 template <class T,