Import Geant4 3.0.0 source tree

source/geometry/solids/STEP/include/STEPattribute.h

@@ -12,7 +12,7 @@
 * and is not subject to copyright.
 */
 
-/* $Id: STEPattribute.h,v 1.4 2000/01/21 13:42:31 gcosmo Exp $ */
+/* $Id: STEPattribute.h,v 1.5 2000/11/20 18:14:54 gcosmo Exp $ */
 
 #include <sclprefixes.h>
 
@@ -123,17 +123,17 @@ class STEPattribute {
 //    friend class SCLP23(Application_instance);
 //  protected:
   public:
+
     ErrorDescriptor _error;
+
+    const AttrDescriptor * aDesc;
+
     unsigned int _derive : 1;
     int Derive (unsigned int n =1)  { return _derive =n; }
 
     STEPattribute *_redefAttr; 
     void RedefiningAttr(STEPattribute *a) { _redefAttr = a; }
 
-  public:
-
-    const AttrDescriptor * aDesc;
-
     // You know which of these to use based on the return value of
     // NonRefType() - see below. BASE_TYPE is defined in baseType.h
     // This variable points to an appropriate member variable in the entity

source/geometry/solids/STEP/include/classes.h

@@ -6,7 +6,7 @@
 
 //
 // $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-02-00 $
+// GEANT4 tag $Name: geant4-03-00 $
 //
 /*
 ** Fed-x parser output module for generating C++  class definitions

source/geometry/solids/STEP/include/complexSupport.h

@@ -129,7 +129,8 @@ class EntList {
     friend G4std::ostream & operator<< ( G4std::ostream &, MultList & );
 
   public:
-    EntList( JoinType j ) : join(j), prev(0), next(0), viable(UNKNOWN),
+    // Changed order of member initialisations to match correct order - GC
+    EntList( JoinType j ) : join(j), next(0), prev(0), viable(UNKNOWN),
                             level(0) {}
     virtual ~EntList() {}
     MatchType viableVal() { return viable; }
@@ -173,7 +174,8 @@ class SimpleList : public EntList {
     friend G4std::ostream & operator<< ( G4std::ostream &, SimpleList & );
 
   public:
-    SimpleList( const char *n ) : I_marked(NOMARK), EntList(SIMPLE)
+    // Changed order of member initialisations to match correct order - GC
+    SimpleList( const char *n ) : EntList(SIMPLE), I_marked(NOMARK)
         { strcpy( name, n ); }
     ~SimpleList() {}
     
@@ -292,7 +294,8 @@ class ComplexList {
   public:
   
     // Changed 'and' to 'andl'. 'and' is reserved word in the standard - GC
-    ComplexList( AndList *andl = NULL ) : head(andl), list(0), next(0),
+    // Changed order of member initialisations to match correct order - GC
+    ComplexList( AndList *andl = NULL ) : list(0), head(andl), next(0),
                                           abstract(0), dependent(0),
                                           multSupers(0) {}
     ~ComplexList();

source/geometry/solids/STEP/include/dirobj.h

@@ -13,7 +13,7 @@
 * and is not subject to copyright.
 */
 
-/* $Id: dirobj.h,v 1.4 2000/06/08 17:18:10 gcosmo Exp $  */ 
+/* $Id: dirobj.h,v 1.6 2000/11/21 07:54:49 gcosmo Exp $  */ 
 
 #ifdef __O3DB__
 #include <OpenOODB.h>