Random stuff.

[polintos/scott/priv.git] / idlcomp / idlc.h

diff --git a/idlcomp/idlc.h b/idlcomp/idlc.h
index a4ca39ab0f7ebd7fa12faa4051006dc55d994843..56dfefea45e543e6b29657f24257bf7faf14e654 100644 (file)
--- a/idlcomp/idlc.h
+++ b/idlcomp/idlc.h
@@ -30,6 +30,7 @@
 #include <list>
 #include <map>
 #include <vector>
+#include <cstring>
 
 #include "compileddef.h"
 
@@ -824,9 +825,9 @@ protected:
        CompiledDefHeader hdr;
 
        // sym is the symbol from which to get the path/name, and
-       // dir is true if it should be "name/.self" rather than 
+       // is_dir is true if it should be "name/.self" rather than 
        // "name".
-       void output_self(const char *dir, Symbol *sym, bool dir);
+       void output_self(const char *dir, Symbol *sym, bool is_dir);
 
 public:
        Def(const char *self, int self_len, CompiledDefHeader::Type type) :
@@ -966,7 +967,6 @@ class Array : public RefCountable<Array>
 
        // lower is [0], upper is [1]
        StrListRef dcons[2];
-       Con cons[2];
        
        // Strings for error reporting on each constant.  If the constant
        // is symbolic, then this is the fully qualified symbol name. 
@@ -977,6 +977,8 @@ class Array : public RefCountable<Array>
        StringRef strs[2];
        
 public:
+       Con cons[2];
+
        // ca is not valid until after final_analysis() is called.
        CompiledArray ca;
 
@@ -1003,8 +1005,6 @@ class Datum : public Symbol, public Def {
        bool const_init; // Datum's constant has been initialized; this is
                         // true after a successful verify_const().
        CompiledBasicType *cbt;
-       
-       ArrayRef array;
 
        int chain_traversed;
 
@@ -1036,6 +1036,7 @@ class Datum : public Symbol, public Def {
        }
 
 public:
+       ArrayRef array;
        CompiledDatum def;
        TypeRef type;