Initial struct marshalling.

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

diff --git a/idlcomp/idlc.h b/idlcomp/idlc.h
index a4ca39ab0f7ebd7fa12faa4051006dc55d994843..414d14a7a08d9b2cd1c7719a09e9bc22aa828001 100644 (file)
--- a/idlcomp/idlc.h
+++ b/idlcomp/idlc.h
@@ -966,7 +966,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 +976,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 +1004,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 +1035,7 @@ class Datum : public Symbol, public Def {
        }
 
 public:
+       ArrayRef array;
        CompiledDatum def;
        TypeRef type;