From 505f4e149e914f2bdbd02df64ddf60853e902ffe Mon Sep 17 00:00:00 2001
From: "rogerl%netscape.com"
 <rogerl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 24 Feb 2003 20:10:08 +0000
Subject: [PATCH] Linux build fixes.

git-svn-id: svn://10.0.0.236/trunk@138361 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js2/src/js2engine.cpp   | 3 +--
 mozilla/js2/src/js2metadata.cpp | 6 +++---
 mozilla/js2/src/js2metadata.h   | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mozilla/js2/src/js2engine.cpp b/mozilla/js2/src/js2engine.cpp
index 8267e7da426..04e07562524 100644
--- a/mozilla/js2/src/js2engine.cpp
+++ b/mozilla/js2/src/js2engine.cpp
@@ -89,7 +89,6 @@ namespace MetaData {
         baseVal = JS2VAL_VOID;
         indexVal = JS2VAL_VOID;
         pFrame = NULL;
-        int i = 0;
         while (true) {
             try {
                 a = JS2VAL_VOID;
@@ -541,7 +540,7 @@ namespace MetaData {
         if (engine) {
             stdOut << bCon->fName << " ";
             if (bCon->fName.length() < 30) {
-                for (int32 i = 0; i < (30 - bCon->fName.length()); i++)
+                for (uint32 i = 0; i < (30 - bCon->fName.length()); i++)
                     stdOut << " ";
             }
             printFormat(stdOut, "%.4d %.4d ", pc - start, (int32)(engine->sp - engine->execStack));
diff --git a/mozilla/js2/src/js2metadata.cpp b/mozilla/js2/src/js2metadata.cpp
index 676feab6b3c..84bdcc51c59 100644
--- a/mozilla/js2/src/js2metadata.cpp
+++ b/mozilla/js2/src/js2metadata.cpp
@@ -3114,7 +3114,7 @@ static const uint8 urlCharType[256] =
         const String *str = meta->toString(argv[0]);
         const char16 *chars = str->data();
         uint32 length = str->length();
-        char16 *numEnd;
+        const char16 *numEnd;
         uint base = 10;
         
         if (argc > 1) {
@@ -3148,8 +3148,8 @@ static const uint8 urlCharType[256] =
         bCon(new BytecodeContainer()),
         glob(new GlobalObject(world)),
         env(new Environment(new MetaData::SystemFrame(), glob)),
-        showTrees(false),
-        flags(JS1)
+        flags(JS1),
+        showTrees(false)
     {
         engine->meta = this;
 
diff --git a/mozilla/js2/src/js2metadata.h b/mozilla/js2/src/js2metadata.h
index 608176c1079..4ea2c8ef2ad 100644
--- a/mozilla/js2/src/js2metadata.h
+++ b/mozilla/js2/src/js2metadata.h
@@ -251,8 +251,8 @@ public:
     bool matches(QualifiedName &q)                  { return (*name == *q.id) && listContains(q.nameSpace); }
     bool listContains(Namespace *nameSpace);
 
-    NamespaceList *nsList;
     const String *name;
+    NamespaceList *nsList;
 
     virtual void markChildren();
     virtual ~Multiname()            { }
@@ -770,7 +770,7 @@ public:
     LexicalReference(Multiname *mname, bool strict) : variableMultiname(*mname), env(NULL), strict(strict) { }
     LexicalReference(const String *name, bool strict) : variableMultiname(name), env(NULL), strict(strict) { }
     LexicalReference(const String *name, Namespace *nameSpace, bool strict) : variableMultiname(name, nameSpace), env(NULL), strict(strict) { }
-
+    virtual ~LexicalReference() { }
     
     Multiname variableMultiname;   // A nonempty set of qualified names to which this reference can refer
     Environment *env;               // The environment in which the reference was created.
@@ -799,6 +799,7 @@ class DotReference : public Reference {
 public:
     DotReference(const String *name) : propertyMultiname(name) { }
     DotReference(Multiname *mn) : propertyMultiname(*mn) { }
+    virtual ~DotReference() { }
 
     // In this implementation, the base is established by the execution of the preceding expression and
     // is available on the execution stack, not in the reference object (which is a codegen-time only)
@@ -827,6 +828,7 @@ class SlotReference : public Reference {
 // A special case of a DotReference with an Sl instead of a D
 public:
     SlotReference(uint32 slotIndex) : slotIndex(slotIndex) { }
+    virtual ~SlotReference()	{ }
 
     virtual void emitReadBytecode(BytecodeContainer *bCon, size_t pos)      { bCon->emitOp(eSlotRead, pos); bCon->addShort((uint16)slotIndex); }
     virtual void emitWriteBytecode(BytecodeContainer *bCon, size_t pos)     { bCon->emitOp(eSlotWrite, pos); bCon->addShort((uint16)slotIndex); }