Import Geant4 1.1.0 source tree

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: EntityInst.h,v 1.2 1999/05/21 20:20:28 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ENTITYINST_H
 #define	ENTITYINST_H 1

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Enumeration.h,v 1.2 1999/05/21 20:20:29 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Enumeration.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef ENUMERATION_H
 #define	ENUMERATION_H 
@@ -34,7 +34,7 @@
 #define ENUM_NULL -1
 
 class STEPenumeration  {
-    friend     ostream &operator<< ( ostream&, const STEPenumeration& );
+    friend     G4std::ostream &operator<< ( G4std::ostream&, const STEPenumeration& );
   protected:
     int v;	//  integer value of enumeration instance 
 	//  mapped to a symbolic value in the elements
@@ -55,18 +55,18 @@ class STEPenumeration  {
 			    int optional, char *tokenList,
 			    int needDelims = 0, int clearError = 1);
 
-    Severity EnumValidLevel(istream &in, ErrorDescriptor *err, 
+    Severity EnumValidLevel(G4std::istream &in, ErrorDescriptor *err, 
 			    int optional, char *tokenList,
 			    int needDelims = 0, int clearError = 1);
 
     const int asInt () const {	return v;    }
     
     const char * asStr (SCLstring &s) const;
-    void STEPwrite (ostream& out = G4cout)  const;
+    void STEPwrite (G4std::ostream& out = G4cout)  const;
     const char * STEPwrite (SCLstring &s) const;
 
     Severity StrToVal (const char * s, ErrorDescriptor *err, int optional = 1);
-    Severity STEPread(istream& in, ErrorDescriptor *err, int optional = 1);
+    Severity STEPread(G4std::istream& in, ErrorDescriptor *err, int optional = 1);
     Severity STEPread(const char *s, ErrorDescriptor *err, int optional = 1);
 
     int put (int val)  {  return set_value (val);    }
@@ -76,9 +76,9 @@ class STEPenumeration  {
     STEPenumeration& operator= (const int);
     STEPenumeration& operator= (const STEPenumeration&);
         
-    void DebugDisplay (ostream& out =G4cout) const;
+    void DebugDisplay (G4std::ostream& out =G4cout) const;
   protected:
-    Severity ReadEnum(istream& in, ErrorDescriptor *err, int AssignVal = 1,
+    Severity ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
 		      int needDelims = 1);
 };
 

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: ExpDict.h,v 1.2 1999/05/21 20:20:29 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef EXPDICT_H
 #define EXPDICT_H

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: Registry.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _REGISTRY_H
 #define _REGISTRY_H

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPaggregate.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPaggregate.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPAGGREGATE_H
 #define STEPAGGREGATE_H
@@ -66,7 +66,7 @@ class STEPaggregate :  public SingleLinkList
 
   protected:
 
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -80,7 +80,7 @@ class STEPaggregate :  public SingleLinkList
 			    int clearError =0);
     
 
-    virtual Severity AggrValidLevel(istream &in, ErrorDescriptor *err, 
+    virtual Severity AggrValidLevel(G4std::istream &in, ErrorDescriptor *err, 
 			    const TypeDescriptor *elem_type, InstMgr *insts, 
 			    int optional, char *tokenList, int addFileId =0, 
 			    int clearError =0);
@@ -89,12 +89,12 @@ class STEPaggregate :  public SingleLinkList
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err =0, 
 			      const TypeDescriptor *elem_type =0,
 			      InstMgr *insts =0, int addFileId = 0);
-    virtual Severity STEPread (istream& in, ErrorDescriptor *err, 
+    virtual Severity STEPread (G4std::istream& in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type =0,
 			       InstMgr *insts =0, int addFileId =0);
 // OUTPUT
     virtual const char *asStr(SCLstring & s) const;
-    virtual void STEPwrite  (ostream& out =G4cout) const;
+    virtual void STEPwrite  (G4std::ostream& out =G4cout) const;
 
 //    SingleLinkNode * GetHead () const
 //	{ return (STEPnode *) SingleLinkList::GetHead(); }
@@ -135,7 +135,7 @@ typedef  GenericAggregate * GenericAggregateH;
 class EntityAggregate  :  public  STEPaggregate 
 {
   public:
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -156,7 +156,7 @@ typedef   EntityAggregate * EntityAggregateH;
 class SelectAggregate  :  public STEPaggregate 
 {
   public:
-    virtual Severity ReadValue(istream &in, ErrorDescriptor *err, 
+    virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err, 
 			       const TypeDescriptor *elem_type, 
 			       InstMgr *insts, int addFileId =0, 
 			       int assignVal =1, int ExchangeFileFormat =1);
@@ -277,15 +277,15 @@ class STEPnode :  public SingleLinkNode  {
 
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void STEPwrite (ostream& out =G4cout);
+    virtual void STEPwrite (G4std::ostream& out =G4cout);
 };
 typedef  STEPnode *  STEPnodeH;
 
@@ -302,15 +302,15 @@ class GenericAggrNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     GenericAggrNode (const char *str);
@@ -332,20 +332,20 @@ class EntityNode  : public STEPnode {
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err, 
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err, 
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     EntityNode (STEPentity * e);
@@ -361,7 +361,7 @@ class EntityNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return StrToVal(s, err, 0, 0, 0);
     }
-    Severity StrToVal(istream &in, ErrorDescriptor *err)
+    Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -374,7 +374,7 @@ class EntityNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return STEPread(s, err, 0, 0, 0);
     }
-    Severity STEPread(istream &in, ErrorDescriptor *err)
+    Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -400,20 +400,20 @@ class SelectNode  : public STEPnode {
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err, 
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err, 
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err, 
 			      const TypeDescriptor *elem_type,
 			      InstMgr *insts, int addFileId = 0);
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     SelectNode (SdaiSelect * s) :  node (s) {    }
@@ -429,7 +429,7 @@ class SelectNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return StrToVal(s, err, 0, 0, 0);
     }
-    Severity StrToVal(istream &in, ErrorDescriptor *err)
+    Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -442,7 +442,7 @@ class SelectNode  : public STEPnode {
 	    << "\n" << _POC_ "\n";
 	return STEPread(s, err, 0, 0, 0);
     }
-    Severity STEPread(istream &in, ErrorDescriptor *err)
+    Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
     {
 	G4cerr << "Internal error:  " << __FILE__ <<  __LINE__
 	    << "\n" << _POC_ "\n";
@@ -465,15 +465,15 @@ class StringNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     StringNode(StringNode& sn);
@@ -499,15 +499,15 @@ class BinaryNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     BinaryNode(BinaryNode& bn);
@@ -532,15 +532,15 @@ class EnumNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     EnumNode (STEPenumeration * e) :  node (e) {    }
@@ -557,15 +557,15 @@ class RealNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     RealNode ()  { value = S_REAL_NULL; }
@@ -581,15 +581,15 @@ class IntNode  : public STEPnode {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring & s);
     virtual const char *STEPwrite (SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
 //	CONSTRUCTORS
     IntNode ()  { value = S_INT_NULL; }

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPattribute.h,v 1.2 1999/05/21 20:20:30 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPattribute.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPATTRIBUTE_H
 #define	STEPATTRIBUTE_H	1
@@ -51,11 +51,7 @@ class TypeDescriptor;
 class AttrDescriptor;
 class EntityDescriptor;
 
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 #include <ExpDict.h>
 
 #define s_String	char *
@@ -65,12 +61,12 @@ extern int SetErrOnNull(const char *attrValue, ErrorDescriptor *error);
 ////////////////////
 
 extern Severity 
-CheckRemainingInput(istream &in, ErrorDescriptor *err, 
+CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err, 
 		    const char *typeName, // used in error message
 		    const char *tokenList); // e.g. ",)"
 
 extern STEPentity *
-ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList, 
+ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId);
 
 extern STEPentity *
@@ -99,18 +95,18 @@ extern STEPentity *STEPread_reference (const char * s, ErrorDescriptor *err,
 				       InstMgr * instances, int addFileId);
 ////////////////////
 
-extern int   QuoteInString(istream& in);
+extern int   QuoteInString(G4std::istream& in);
 
 extern void  AppendChar(char c, int& index, char *&s, int& sSize);
 
 extern void 
-PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 //extern  Severity ValidateEntityType(STEPentity *se, 
 //					const AttrDescriptor *ad, 
@@ -118,7 +114,7 @@ PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
 
 class STEPattribute {
 
-    friend ostream &operator<< ( ostream&, STEPattribute& );
+    friend G4std::ostream &operator<< ( G4std::ostream&, STEPattribute& );
     friend class STEPentity;
     
   protected:
@@ -150,7 +146,7 @@ class STEPattribute {
 	} ptr;
 
   protected:
-    char SkipBadAttr(istream& in, char *StopChars);
+    char SkipBadAttr(G4std::istream& in, char *StopChars);
     void AddErrorInfo();
 
   public:
@@ -159,11 +155,11 @@ class STEPattribute {
 
     Severity StrToVal(const char *s, InstMgr *instances =0, 
 		      int addFileId =0);
-    Severity STEPread(istream& in = cin, InstMgr *instances =0, 
+    Severity STEPread(G4std::istream& in = G4cin, InstMgr *instances =0, 
 		      int addFileId =0);
 
     const char * asStr(SCLstring &) const; // return the attr value as a string
-    void STEPwrite(ostream& out = G4cout);
+    void STEPwrite(G4std::ostream& out = G4cout);
 
     BOOLEAN ShallowCopy(STEPattribute *sa);
 

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: STEPattributeList.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef _STEPattributeList_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPcomplex.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPcomplex.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPCOMPLEX_H
 #define STEPCOMPLEX_H
@@ -46,14 +46,14 @@ class STEPcomplex : public STEPentity {
 // READ
     virtual Severity STEPread(int id, int addFileId, 
 				   InstMgr * instance_set,
-				   istream& in =cin);
-    virtual void STEPread_error(char c, int index, istream& in);
+				   G4std::istream& in =G4cin);
+    virtual void STEPread_error(char c, int index, G4std::istream& in);
 
 // WRITE
-    virtual void STEPwrite(ostream& out =G4cout, int writeComment = 1);
+    virtual void STEPwrite(G4std::ostream& out =G4cout, int writeComment = 1);
     virtual const char * STEPwrite(SCLstring &buf);
 
-    virtual void WriteExtMapEntities(ostream& out =G4cout);
+    virtual void WriteExtMapEntities(G4std::ostream& out =G4cout);
     virtual const char * WriteExtMapEntities(SCLstring &buf);
     virtual void AppendEntity(STEPcomplex *stepc);
 

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPentity.h,v 1.2 1999/05/21 20:20:31 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPentity.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPENTITY_H
 #define	STEPENTITY_H 1
@@ -114,18 +114,18 @@ class STEPentity : public EntityInstance {
 // READ
     virtual Severity STEPread(int id, int addFileId, 
 			      class InstMgr * instance_set,
-			      istream& in =cin);
-    virtual void STEPread_error(char c, int index, istream& in);
+			      G4std::istream& in =G4cin);
+    virtual void STEPread_error(char c, int index, G4std::istream& in);
 
 // WRITE
-    virtual void STEPwrite(ostream& out =G4cout, int writeComment = 1);
+    virtual void STEPwrite(G4std::ostream& out =G4cout, int writeComment = 1);
     virtual const char * STEPwrite(SCLstring &buf);
 
-    void	 STEPwrite_reference (ostream& out =G4cout);
+    void	 STEPwrite_reference (G4std::ostream& out =G4cout);
     const char * STEPwrite_reference (SCLstring &buf);
 
-    void beginSTEPwrite(ostream& out =G4cout); // writes out the SCOPE section
-    void endSTEPwrite(ostream& out =G4cout);
+    void beginSTEPwrite(G4std::ostream& out =G4cout); // writes out the SCOPE section
+    void endSTEPwrite(G4std::ostream& out =G4cout);
 
 // MULTIPLE INHERITANCE
     int MultipleInheritance() { return !(headMiEntity == 0); }
@@ -156,7 +156,7 @@ typedef STEPentity* STEPentityPtr;
 typedef STEPentity* STEPentityH;
 
 extern STEPentity *
-ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList, 
+ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList, 
 	      InstMgr * instances, int addFileId);
 
 //typedef  STEPentity * (* Creator) () const;

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPfile.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPfile.h,v 1.3 1999/12/15 14:50:14 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _STEPFILE_H
 #define	_STEPFILE_H
@@ -35,7 +35,7 @@
 
 #include <instmgr.h>
 #include <Registry.h>
-#include <fstream.h>
+#include "g4std/fstream"
 #include <dirobj.h>
 #include <errordesc.h>
 #include <time.h>
@@ -143,12 +143,12 @@ class STEPfile
     Severity ReadWorkingFile (const char* filename =0);
     Severity AppendWorkingFile (const char* filename =0);
 
-    Severity AppendFile (istream* in) ;
+    Severity AppendFile (G4std::istream* in) ;
 
-    Severity WriteExchangeFile (ostream& out, int validate =1);
+    Severity WriteExchangeFile (G4std::ostream& out, int validate =1);
     Severity WriteExchangeFile (const char* filename =0, int validate =1);
 
-    Severity WriteWorkingFile (ostream& out);
+    Severity WriteWorkingFile (G4std::ostream& out);
     Severity WriteWorkingFile (const char* filename =0);
 
     stateEnum EntityWfState(char c);
@@ -163,10 +163,10 @@ class STEPfile
 //member functions
     
 //called by ReadExchangeFile
-    istream* OpenInputFile (const char* filename = "");
-    void CloseInputFile(istream* in);
+    G4std::istream* OpenInputFile (const char* filename = "");
+    void CloseInputFile(G4std::istream* in);
     
-    Severity ReadHeader(istream& in);
+    Severity ReadHeader(G4std::istream& in);
 
     InstMgr* HeaderConvertToNew(InstMgr& oldinst);
     Severity HeaderVerifyInstances(InstMgr* im);
@@ -180,53 +180,53 @@ class STEPfile
                                                 //   J.Apostolakis Oct 30, 98
     int HeaderIdOld (const char* nm ="\0");
 
-    int ReadData1 (istream& in); // first pass to create instances
-    int ReadData2 (istream& in); // second pass to read instances
+    int ReadData1 (G4std::istream& in); // first pass to create instances
+    int ReadData2 (G4std::istream& in); // second pass to read instances
 
 // obsolete
-    int ReadWorkingData1 (istream& in);
-    int ReadWorkingData2 (istream& in);
+    int ReadWorkingData1 (G4std::istream& in);
+    int ReadWorkingData2 (G4std::istream& in);
 
-    void ReadRestOfFile(istream& in);
+    void ReadRestOfFile(G4std::istream& in);
 
 	// create instance - used by ReadData1()
-    STEPentity *  CreateInstance(istream& in, ostream& out);
+    STEPentity *  CreateInstance(G4std::istream& in, G4std::ostream& out);
 	// create complex instance - used by CreateInstance()
-    STEPentity * CreateSubSuperInstance(istream& in, int fileid);
+    STEPentity * CreateSubSuperInstance(G4std::istream& in, int fileid);
 
 	// read the instance - used by ReadData2()
-    STEPentity * ReadInstance (istream& in, ostream& out, SCLstring &cmtStr);
+    STEPentity * ReadInstance (G4std::istream& in, G4std::ostream& out, SCLstring &cmtStr);
 
   //  reading scopes are still incomplete
   //  these functions are stubs
-    Severity CreateScopeInstances(istream& in, STEPentityH ** scopelist);
-    Severity ReadScopeInstances(istream& in);
-//    Severity ReadSubSuperInstance(istream& in);
+    Severity CreateScopeInstances(G4std::istream& in, STEPentityH ** scopelist);
+    Severity ReadScopeInstances(G4std::istream& in);
+//    Severity ReadSubSuperInstance(G4std::istream& in);
 
-    int FindDataSection (istream& in);
-    int FindHeaderSection (istream& in);
+    int FindDataSection (G4std::istream& in);
+    int FindHeaderSection (G4std::istream& in);
 
 // writing working session files
-    void WriteWorkingData(ostream& out);
+    void WriteWorkingData(G4std::ostream& out);
 
 //called by WriteExchangeFile
-    ofstream* OpenOutputFile(const char* filename =0);
-    void CloseOutputFile(ostream* out);
+    G4std::ofstream* OpenOutputFile(const char* filename =0);
+    void CloseOutputFile(G4std::ostream* out);
 
-    void WriteHeader (ostream& out);
-    void WriteHeaderInstance (STEPentity *obj, ostream& out);
-    void WriteHeaderInstanceFileName (ostream& out);
-    void WriteHeaderInstanceFileDescription (ostream& out);
-    void WriteHeaderInstanceFileSchema (ostream& out);
+    void WriteHeader (G4std::ostream& out);
+    void WriteHeaderInstance (STEPentity *obj, G4std::ostream& out);
+    void WriteHeaderInstanceFileName (G4std::ostream& out);
+    void WriteHeaderInstanceFileDescription (G4std::ostream& out);
+    void WriteHeaderInstanceFileSchema (G4std::ostream& out);
 
-    void WriteData (ostream& out);
+    void WriteData (G4std::ostream& out);
     
     int IncrementFileId (int fileid);
     int FileIdIncr() { return _fileIdIncr; }
     void SetFileIdIncrement ();
     void MakeBackupFile();
 
-//    void ReadWhiteSpace(istream& in);
+//    void ReadWhiteSpace(G4std::istream& in);
 };
 
 //inline functions

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPselect.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPselect.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _STEPSELECT_H
 #define _STEPSELECT_H
@@ -84,8 +84,8 @@ class SdaiSelect {
 
   // reading and writing
         const char * STEPwrite(SCLstring& s)  const;
-	void STEPwrite (ostream& out =G4cout) const;
-        virtual void STEPwrite_content (ostream& out) const =0;
+	void STEPwrite (G4std::ostream& out =G4cout) const;
+        virtual void STEPwrite_content (G4std::ostream& out) const =0;
 //	char * asStr() const;
 
 
@@ -94,11 +94,11 @@ class SdaiSelect {
         virtual Severity StrToVal_content (const char *, 
 					   InstMgr * instances =0) =0;
 
-	Severity STEPread(istream& in, ErrorDescriptor *err, 
+	Severity STEPread(G4std::istream& in, ErrorDescriptor *err, 
 			  InstMgr * instances = 0, int addFileId =0);
 
 		// abstract function
-        virtual Severity STEPread_content (istream& in =cin, 
+        virtual Severity STEPread_content (G4std::istream& in =G4cin, 
 					   InstMgr * instances =0, 
 					   int addFileId =0) =0;
 

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPstring.h,v 1.2 1999/05/21 20:20:32 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPstring.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef STEPSTRING_H
 #define	STEPSTRING_H  1
@@ -49,11 +49,11 @@ public:
 
   // format for STEP
   const char * asStr (SCLstring & s) const  {  return s = chars ();  }
-  void STEPwrite (ostream& out =G4cout)  const;
+  void STEPwrite (G4std::ostream& out =G4cout)  const;
   void STEPwrite (SCLstring &s) const;
 
   Severity StrToVal (const char *s);
-  Severity STEPread (istream& in, ErrorDescriptor *err);
+  Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
   Severity STEPread (const char *s, ErrorDescriptor *err);
 
  protected:

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: STEPundefined.h,v 1.2 1999/05/21 20:20:33 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: STEPundefined.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef	STEPUNDEFINED_H
 #define	STEPUNDEFINED_H
@@ -39,15 +39,15 @@ class SCLundefined  {
   public:
 //	INPUT
     virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
-    virtual Severity StrToVal(istream &in, ErrorDescriptor *err);
+    virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
 
     virtual Severity STEPread(const char *s, ErrorDescriptor *err);
-    virtual Severity STEPread(istream &in, ErrorDescriptor *err);
+    virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
 
 //	OUTPUT
     virtual const char *asStr(SCLstring &s) const;
     virtual const char *STEPwrite(SCLstring &s);
-    virtual void 	STEPwrite (ostream& out =G4cout);
+    virtual void 	STEPwrite (G4std::ostream& out =G4cout);
 
     int set_null ();
     int is_null ();

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiBinary.h,v 1.2 1999/05/21 20:20:33 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiBinary.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef SDAIBINARY_H
 #define	SDAIBINARY_H 1
@@ -30,11 +30,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 class ErrorDescriptor;
 #include <scl_string.h>
@@ -64,22 +60,22 @@ class SdaiBinary : public SCLstring
 
     // format for STEP
     const char * asStr () const  {  return chars ();  }
-    void STEPwrite (ostream& out =G4cout)  const;
+    void STEPwrite (G4std::ostream& out =G4cout)  const;
     const char * STEPwrite (SCLstring &s) const;
 
     Severity StrToVal (const char *s, ErrorDescriptor *err);
-    Severity STEPread (istream& in, ErrorDescriptor *err);
+    Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
     Severity STEPread (const char *s, ErrorDescriptor *err);
 
     Severity BinaryValidLevel (const char *value, ErrorDescriptor *err,
 			       int optional, char *tokenList,
 			       int needDelims = 0, int clearError = 1);
-    Severity BinaryValidLevel (istream &in, ErrorDescriptor *err, 
+    Severity BinaryValidLevel (G4std::istream &in, ErrorDescriptor *err, 
 			       int optional, char *tokenList,
 			       int needDelims = 0, int clearError = 1);
 
  protected:
-  Severity ReadBinary(istream& in, ErrorDescriptor *err, int AssignVal = 1,
+  Severity ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
 		      int needDelims = 1);
 };
 

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.2 1999/05/21 20:20:35 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SDAICONFIG_CONTROL_DESIGN_H
 #define  SDAICONFIG_CONTROL_DESIGN_H
@@ -1760,8 +1760,8 @@ class SdaiCharacterized_product_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -1846,8 +1846,8 @@ class SdaiShape_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -1936,8 +1936,8 @@ class SdaiCharacterized_definition  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2006,8 +2006,8 @@ class SdaiChange_request_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2083,8 +2083,8 @@ class SdaiReversible_topology_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2186,8 +2186,8 @@ class SdaiAxis2_placement  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2265,8 +2265,8 @@ class SdaiSpecified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2361,8 +2361,8 @@ class SdaiMeasure_value  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2442,8 +2442,8 @@ class SdaiPerson_organization_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2513,8 +2513,8 @@ class SdaiPcurve_or_surface  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2590,8 +2590,8 @@ class SdaiClassified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2675,8 +2675,8 @@ class SdaiVector_or_direction  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2754,8 +2754,8 @@ class SdaiWireframe_model  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2832,8 +2832,8 @@ class SdaiGeometric_set_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2908,8 +2908,8 @@ class SdaiStart_request_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -2989,8 +2989,8 @@ class SdaiPerson_organization_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3125,8 +3125,8 @@ class SdaiDate_time_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3254,8 +3254,8 @@ class SdaiShell  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3341,8 +3341,8 @@ class SdaiTransformation  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3419,8 +3419,8 @@ class SdaiBoolean_operand  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3487,8 +3487,8 @@ class SdaiCertified_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3563,8 +3563,8 @@ class SdaiDate_time_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3635,8 +3635,8 @@ class SdaiCurve_on_surface  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3727,8 +3727,8 @@ class SdaiTrimming_select  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3801,8 +3801,8 @@ class SdaiContracted_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3873,8 +3873,8 @@ class SdaiUnit  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -3944,8 +3944,8 @@ class SdaiReversible_topology  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4016,8 +4016,8 @@ class SdaiWork_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4090,8 +4090,8 @@ class SdaiSupported_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4190,8 +4190,8 @@ class SdaiApproved_item  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 
@@ -4326,8 +4326,8 @@ class SdaiSurface_model  :  public SdaiSelect {
 
 
 // STEP Part 21
-	virtual void STEPwrite_content (ostream& out =G4cout) const;
-	virtual Severity STEPread_content (istream& in =cin, InstMgr * instances =0, int addFileId =0);
+	virtual void STEPwrite_content (G4std::ostream& out =G4cout) const;
+	virtual Severity STEPread_content (G4std::istream& in =G4cin, InstMgr * instances =0, int addFileId =0);
 
 	virtual Severity StrToVal_content (const char *, InstMgr * instances =0);
 

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: SingleLinkList.h,v 1.2 1999/05/21 20:20:36 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef singlelinklist_h
 #define	singlelinklist_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: Str.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: Str.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef STR_H
@@ -51,7 +51,7 @@ char * PrettyNewName (const char * oldname);
 char * EntityClassName ( char * oldname);
 
 extern Severity CheckRemainingInput
-   (istream &in, ErrorDescriptor *err, 
+   (G4std::istream &in, ErrorDescriptor *err, 
     const char *typeName, // used in error message
     const char *tokenList); // e.g. ",)"
 

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: baseType.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef BASETYPE_H
 #define	BASETYPE_H

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: classes.h,v 1.2 1999/05/21 20:20:37 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
 ** Fed-x parser output module for generating C++  class definitions

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: cmdmgr.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef cmdmgr_h
 #define cmdmgr_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: dir.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifdef __O3DB__

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: dirobj.h,v 1.2 1999/05/21 20:20:38 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dirobj_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnode.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dispnode_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: dispnodelist.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef dispnodelist_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: editordefines.h,v 1.2 1999/05/21 20:20:39 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef editordefines_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: errordesc.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: errordesc.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef ERRORDESC_H
@@ -69,7 +69,7 @@ enum  DebugLevel  {
  ** Description:  
  **	the error is a detailed error message + a severity level
  **	also keeps a user message separately
- **	detailed message gets sent to ostream
+ **	detailed message gets sent to G4std::ostream
  **	uses SCLstring class to keep the user messages
  **	keeps severity of error
  **	created with or without error
@@ -77,13 +77,13 @@ enum  DebugLevel  {
  ******************************************************************/
 
 class ErrorDescriptor {
-//  friend     istream &operator<< ( istream&, ErrorDescriptor& );
+//  friend     G4std::istream &operator<< ( G4std::istream&, ErrorDescriptor& );
   protected:
   
     Severity	_severity;
 
     static DebugLevel	_debug_level;
-    static ostream* _out;
+    static G4std::ostream* _out;
     
     SCLstring *_userMsg;
     SCLstring *_detailMsg;
@@ -134,7 +134,7 @@ class ErrorDescriptor {
 
     DebugLevel debug_level() const        { return _debug_level; }
     void debug_level(DebugLevel d)   { _debug_level = d; }
-    void SetOutput(ostream *o)      { _out = o; }
+    void SetOutput(G4std::ostream *o)      { _out = o; }
     
     // void operator =  (const char* y)  {  SCLstring::operator = (y);  }
     

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: gennode.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: gennode.h,v 1.3 1999/12/15 18:04:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennode_h
@@ -29,11 +29,8 @@
 #include <OpenOODB.h>
 #endif
 
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+#include "G4ios.hh"
+
 class GenNodeList;
 class MgrNodeList;
 class DisplayNodeList;

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: gennodearray.h,v 1.2 1999/05/21 20:20:40 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennodearray_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: gennodelist.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: gennodelist.h,v 1.3 1999/12/15 18:04:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef gennodelist_h
@@ -29,11 +29,7 @@
 #include <OpenOODB.h>
 #endif
 
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+#include "G4ios.hh"
 
 //////////////////////////////////////////////////////////////////////////////
 // class GenNodeList

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: instmgr.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef instmgr_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnode.h,v 1.2 1999/05/21 20:20:41 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef mgrnode_h
 #define mgrnode_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: mgrnodearray.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: mgrnodearray.h,v 1.3 1999/12/15 14:50:15 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef mgrnodearray_h
@@ -91,7 +91,7 @@ public:
 
     virtual int Insert(GenericNode* gn);
     virtual int Insert(GenericNode* gn, int index) 
-	{ cerr << 
+	{ G4cerr << 
 	  "Call MgrNodeArraySorted::Insert() without index argument instead.\n"
 		<< "index argument: " << index << " being ignored.\n";
 	  return Insert(gn); }

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: mgrnodelist.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef mgrnodelist_h

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: read_func.h,v 1.2 1999/05/21 20:20:42 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: read_func.h,v 1.3 1999/12/15 14:50:16 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef READ_FUNC_H
 #define	READ_FUNC_H
@@ -18,11 +18,11 @@
 // Print Error information for debugging purposes
 extern void PrintErrorState(ErrorDescriptor &err);
 
-// Print istream error information for debugging purposes
-extern void IStreamState(istream &in);
+// Print G4std::istream error information for debugging purposes
+extern void IStreamState(G4std::istream &in);
 
 extern int 
-ReadInteger(SdaiInteger &val, istream &in, ErrorDescriptor *err, 
+ReadInteger(SdaiInteger &val, G4std::istream &in, ErrorDescriptor *err, 
 	    char *tokenList);
 
 extern int 
@@ -34,7 +34,7 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
 	       int clearError, int optional, char *tokenList);
 
 extern int
-ReadReal(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadReal(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	 char *tokenList);
 
 extern int
@@ -46,7 +46,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
 		int clearError, int optional, char *tokenList);
 
 extern int
-ReadNumber(SdaiReal &val, istream &in, ErrorDescriptor *err, 
+ReadNumber(SdaiReal &val, G4std::istream &in, ErrorDescriptor *err, 
 	   char *tokenList);
 
 extern int
@@ -60,45 +60,45 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
 
 ////////////////////
 
-extern int   QuoteInString(istream& in);
+extern int   QuoteInString(G4std::istream& in);
 
 extern void 
-PushPastString (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastImbedAggr (istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 extern void 
-PushPastAggr1Dim(istream& in, SCLstring &s, ErrorDescriptor *err);
+PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
 
 ////////////////////
 
 extern Severity 
-FindStartOfInstance(istream& in, SCLstring&  inst);
+FindStartOfInstance(G4std::istream& in, SCLstring&  inst);
 
 	//  used for instances that aren\'t valid - reads to next \';\'
 extern Severity 
-SkipInstance (istream& in, SCLstring & inst);
+SkipInstance (G4std::istream& in, SCLstring & inst);
 
 extern const char *
-SkipSimpleRecord(istream &in, SCLstring &buf, ErrorDescriptor *err);
+SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err);
 
  // this includes entity names
 extern const char *
-ReadStdKeyword(istream& in, SCLstring &buf, int skipInitWS = 1);
+ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS = 1);
 
 extern const char* 
-GetKeyword(istream& in, const char* delims, ErrorDescriptor &err);
+GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err);
 
 extern int 
-FoundEndSecKywd(istream& in, ErrorDescriptor &err);
+FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err);
 
 extern const char *ReadComment(SCLstring &ss, const char *s);
 
-extern const char *ReadComment(istream& in, SCLstring &s);
+extern const char *ReadComment(G4std::istream& in, SCLstring &s);
 
-extern Severity    ReadPcd(istream& in);   //Print control directive
+extern Severity    ReadPcd(G4std::istream& in);   //Print control directive
 
-extern void        ReadTokenSeparator(istream& in, SCLstring *comments = 0);
+extern void        ReadTokenSeparator(G4std::istream& in, SCLstring *comments = 0);
 
 #endif

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: s_HEADER_SCHEMA.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  S_HEADER_SCHEMA_H
 #define  S_HEADER_SCHEMA_H

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: schema.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef  SCHEMA_H
 #define  SCHEMA_H

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: scl_hash.h,v 1.2 1999/05/21 20:20:43 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef SCL_HASH_H

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

@@ -5,8 +5,8 @@
 
 
 //
-// $Id: scl_string.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: scl_string.h,v 1.3 1999/12/15 18:04:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef _SCL_STRING_H
 #define _SCL_STRING_H
@@ -36,11 +36,8 @@
 // this file is not in gnu C++ but it doesn't seem to be needed.
 #include <stdarg.h>
 #endif
-#ifdef WIN32
-#  include "G4ios.hh"
-#else
-#  include <stream.h>
-#endif
+
+#include "G4ios.hh"
 #include <string.h>
 
 /******************************************************************

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: sdai.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef SDAI_H
 #define	SDAI_H

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: seeinfodefault.h,v 1.2 1999/05/21 20:20:44 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef seeinfodefault_h
 #define seeinfodefault_h

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

@@ -6,7 +6,7 @@
 
 //
 // $Id: stat.h,v 1.2 1999/05/21 20:20:45 japost Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifdef __O3DB__