lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/STEP/History
+9 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.10 2002/07/04 16:17:48 gcosmo Exp $
$Id: History,v 1.11 2003/06/06 17:10:38 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -19,6 +19,14 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
June 6, 2003 Gabriele Cosmo (STEP-V05-01-00)
- STEPattribute.h: commented unused definition of 'real' since clashing
with system headers.
- STEPattribute.cc, sdaiString.cc: removed usage of G4USE_STD_NAMESPACE
macro, according to migration from g4std wrappers.
- Replaced usage of G4std:: with std::
- Replaced inclusion of g4std wrappers with real std headers.
July 4, 2002 Gabriele Cosmo (STEP-V04-01-00)
- GNUmakefile: parse 'g++' string in G4SYSTEM to detect non-ISO setup for
gcc-2.95 and higher.
source/geometry/solids/STEP/include/ExpDict.h
+5 -5
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: ExpDict.h,v 1.3 2000/01/21 13:42:30 gcosmo Exp $ */
/* $Id: ExpDict.h,v 1.4 2003/06/06 17:07:28 gcosmo Exp $ */
#ifdef __OSTORE__
#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -691,16 +691,16 @@ class Schema : public Dictionary_instance {
{ return _typeList.AddNode(td); }
// the whole schema
void GenerateExpress(G4std::ostream& out) const;
void GenerateExpress(std::ostream& out) const;
// USE, REFERENCE definitions
void GenerateUseRefExpress(G4std::ostream& out) const;
void GenerateUseRefExpress(std::ostream& out) const;
// TYPE definitions
void GenerateTypesExpress(G4std::ostream& out) const;
void GenerateTypesExpress(std::ostream& out) const;
// Entity definitions
void GenerateEntitiesExpress(G4std::ostream& out) const;
void GenerateEntitiesExpress(std::ostream& out) const;
};
typedef Schema SchemaDescriptor;
source/geometry/solids/STEP/include/STEPaggregate.h
+38 -38
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPaggregate.h,v 1.4 2000/01/21 13:42:31 gcosmo Exp $ */
/* $Id: STEPaggregate.h,v 1.5 2003/06/06 17:07:28 gcosmo Exp $ */
#ifdef __OSTORE__
#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -64,7 +64,7 @@ class STEPaggregate : public SingleLinkList
protected:
virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err,
virtual Severity ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId =0,
int assignVal =1, int ExchangeFileFormat =1,
@@ -78,7 +78,7 @@ class STEPaggregate : public SingleLinkList
int optional, char *tokenList, int addFileId =0,
int clearError =0);
virtual Severity AggrValidLevel(G4std::istream &in, ErrorDescriptor *err,
virtual Severity AggrValidLevel(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int optional, char *tokenList, int addFileId =0,
int clearError =0);
@@ -87,13 +87,13 @@ 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 (G4std::istream& in, ErrorDescriptor *err,
virtual Severity STEPread (std::istream& in, ErrorDescriptor *err,
const TypeDescriptor *elem_type =0,
InstMgr *insts =0, int addFileId =0,
const char *currSch =0);
// OUTPUT
virtual const char *asStr(SCLstring & s) const;
virtual void STEPwrite (G4std::ostream& out =G4cout, const char * =0) const;
virtual void STEPwrite (std::ostream& out =G4cout, const char * =0) const;
// SingleLinkNode * GetHead () const
// { return (STEPnode *) SingleLinkList::GetHead(); }
@@ -144,7 +144,7 @@ typedef GenericAggregate_ptr GenericAggregate_var;
class EntityAggregate : public STEPaggregate
{
public:
virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err,
virtual Severity ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId =0,
int assignVal =1, int ExchangeFileFormat =1,
@@ -172,7 +172,7 @@ typedef EntityAggregate_ptr EntityAggregate_var;
class SelectAggregate : public STEPaggregate
{
public:
virtual Severity ReadValue(G4std::istream &in, ErrorDescriptor *err,
virtual Severity ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId =0,
int assignVal =1, int ExchangeFileFormat =1,
@@ -352,15 +352,15 @@ class STEPnode : public SingleLinkNode {
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite(SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
#ifdef __OSTORE__
static os_typespec* get_os_typespec();
#endif
@@ -380,15 +380,15 @@ class GenericAggrNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite(SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
GenericAggrNode (const char *str);
@@ -414,20 +414,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(G4std::istream &in, ErrorDescriptor *err,
virtual Severity StrToVal(std::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(G4std::istream &in, ErrorDescriptor *err,
virtual Severity STEPread(std::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, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
EntityNode (SCLP23(Application_instance) * e);
@@ -443,7 +443,7 @@ class EntityNode : public STEPnode {
<< "\n" << _POC_ "\n";
return StrToVal(s, err, 0, 0, 0);
}
Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity StrToVal(std::istream &in, ErrorDescriptor *err)
{
G4cerr << "Internal error: " << __FILE__ << __LINE__
<< "\n" << _POC_ "\n";
@@ -456,7 +456,7 @@ class EntityNode : public STEPnode {
<< "\n" << _POC_ "\n";
return STEPread(s, err, 0, 0, 0);
}
Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
Severity STEPread(std::istream &in, ErrorDescriptor *err)
{
G4cerr << "Internal error: " << __FILE__ << __LINE__
<< "\n" << _POC_ "\n";
@@ -486,7 +486,7 @@ class SelectNode : public STEPnode {
virtual Severity StrToVal(const char *s, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId = 0);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err,
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId = 0,
const char *currSch =0);
@@ -494,14 +494,14 @@ class SelectNode : public STEPnode {
virtual Severity STEPread(const char *s, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId = 0);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err,
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId = 0,
const char *currSch =0);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
SelectNode(SCLP23(Select) * s);
@@ -517,7 +517,7 @@ class SelectNode : public STEPnode {
<< "\n" << _POC_ "\n";
return StrToVal(s, err, 0, 0, 0);
}
Severity StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity StrToVal(std::istream &in, ErrorDescriptor *err)
{
G4cerr << "Internal error: " << __FILE__ << __LINE__
<< "\n" << _POC_ "\n";
@@ -530,7 +530,7 @@ class SelectNode : public STEPnode {
<< "\n" << _POC_ "\n";
return STEPread(s, err, 0, 0, 0);
}
Severity STEPread(G4std::istream &in, ErrorDescriptor *err)
Severity STEPread(std::istream &in, ErrorDescriptor *err)
{
G4cerr << "Internal error: " << __FILE__ << __LINE__
<< "\n" << _POC_ "\n";
@@ -557,15 +557,15 @@ class StringNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
StringNode(StringNode& sn);
@@ -595,15 +595,15 @@ class BinaryNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
BinaryNode(BinaryNode& bn);
@@ -632,15 +632,15 @@ class EnumNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
EnumNode(SCLP23(Enum) * e);
@@ -661,15 +661,15 @@ class RealNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
RealNode();
@@ -689,15 +689,15 @@ class IntNode : public STEPnode {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring & s);
virtual const char *STEPwrite (SCLstring &s, const char * =0);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
// CONSTRUCTORS
IntNode();
source/geometry/solids/STEP/include/STEPattribute.h
+15 -13
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPattribute.h,v 1.5 2000/11/20 18:14:54 gcosmo Exp $ */
/* $Id: STEPattribute.h,v 1.6 2003/06/06 17:07:28 gcosmo Exp $ */
#include <sclprefixes.h>
@@ -34,8 +34,10 @@
// in STEPaggregate.cc and STEPattribute.cc
#define REAL_NUM_PRECISION 15
// Commented out following declarations, since not used and
// causing clashes with system headers on some compilers.... - GC
//typedef unsigned short BOOLEAN;
typedef double real;
//typedef double real;
class InstMgr;
// Commented out following declaration, since meaningless - GC
@@ -51,7 +53,7 @@ class TypeDescriptor;
class AttrDescriptor;
class EntityDescriptor;
#include "g4std/strstream"
#include <strstream>
//#include <ExpDict.h>
//#define s_String char *
@@ -61,12 +63,12 @@ extern int SetErrOnNull(const char *attrValue, ErrorDescriptor *error);
////////////////////
extern Severity
CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err,
CheckRemainingInput(std::istream &in, ErrorDescriptor *err,
const char *typeName, // used in error message
const char *tokenList); // e.g. ",)"
extern SCLP23(Application_instance) *
ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(std::istream &in, ErrorDescriptor *err, char *tokenList,
InstMgr * instances, int addFileId);
extern SCLP23(Application_instance) *
@@ -95,18 +97,18 @@ extern SCLP23(Application_instance) *STEPread_reference (const char * s, ErrorDe
InstMgr * instances, int addFileId);
////////////////////
extern int QuoteInString(G4std::istream& in);
extern int QuoteInString(std::istream& in);
extern void AppendChar(char c, int& index, char *&s, int& sSize);
extern void
PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastString (std::istream& in, SCLstring &s, ErrorDescriptor *err);
extern void
PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastImbedAggr (std::istream& in, SCLstring &s, ErrorDescriptor *err);
extern void
PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastAggr1Dim(std::istream& in, SCLstring &s, ErrorDescriptor *err);
//extern Severity ValidateEntityType(SCLP23(Application_instance) *se,
// const AttrDescriptor *ad,
@@ -114,7 +116,7 @@ PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
class STEPattribute {
friend G4std::ostream &operator<< ( G4std::ostream&, STEPattribute& );
friend std::ostream &operator<< ( std::ostream&, STEPattribute& );
// The CenterLine compiler couldn't handle this friend declaration.
// Here is the error
@@ -154,7 +156,7 @@ class STEPattribute {
} ptr;
protected:
char SkipBadAttr(G4std::istream& in, char *StopChars);
char SkipBadAttr(std::istream& in, char *StopChars);
void AddErrorInfo();
public:
@@ -163,12 +165,12 @@ class STEPattribute {
Severity StrToVal(const char *s, InstMgr *instances =0,
int addFileId =0);
Severity STEPread(G4std::istream& in = G4cin, InstMgr *instances =0,
Severity STEPread(std::istream& in = G4cin, InstMgr *instances =0,
int addFileId =0, const char * =NULL);
const char * asStr(SCLstring &, const char * =0) const;
// return the attr value as a string
void STEPwrite(G4std::ostream& out = G4cout, const char * =0);
void STEPwrite(std::ostream& out = G4cout, const char * =0);
int ShallowCopy(STEPattribute *sa);
source/geometry/solids/STEP/include/STEPcomplex.h
+4 -4
View File
@@ -40,19 +40,19 @@ class STEPcomplex : public SCLP23(Application_instance) {
// READ
virtual Severity STEPread(int id, int addFileId,
class InstMgr * instance_set,
G4std::istream& in =G4cin, const char *currSch =NULL,
std::istream& in =G4cin, const char *currSch =NULL,
int useTechCor =1);
virtual void STEPread_error(char c, int index, G4std::istream& in);
virtual void STEPread_error(char c, int index, std::istream& in);
// WRITE
virtual void STEPwrite(G4std::ostream& out =G4cout, const char *currSch =NULL,
virtual void STEPwrite(std::ostream& out =G4cout, const char *currSch =NULL,
int writeComment = 1);
virtual const char * STEPwrite(SCLstring &buf, const char *currSch =NULL);
SCLP23(Application_instance) *Replicate();
virtual void WriteExtMapEntities(G4std::ostream& out =G4cout,
virtual void WriteExtMapEntities(std::ostream& out =G4cout,
const char *currSch =NULL);
virtual const char * WriteExtMapEntities(SCLstring &buf,
const char *currSch =NULL);
source/geometry/solids/STEP/include/STEPfile.h
+33 -33
View File
@@ -13,7 +13,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPfile.h,v 1.5 2000/02/14 13:44:02 gcosmo Exp $ */
/* $Id: STEPfile.h,v 1.6 2003/06/06 17:07:28 gcosmo Exp $ */
#ifdef __OSTORE__
#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -26,7 +26,7 @@
/*#include <math.h>*/
#include <instmgr.h>
#include <Registry.h>
#include "g4std/fstream"
#include <fstream>
#include <dirobj.h>
#include <errordesc.h>
#include <time.h>
@@ -147,17 +147,17 @@ class STEPfile
Severity ReadWorkingFile (const char* filename =0, int useTechCor =1);
Severity AppendWorkingFile (const char* filename =0, int useTechCor =1);
Severity AppendFile (G4std::istream* in, int useTechCor =1) ;
Severity AppendFile (std::istream* in, int useTechCor =1) ;
Severity WriteExchangeFile (G4std::ostream& out, int validate =1,
Severity WriteExchangeFile (std::ostream& out, int validate =1,
int clearError = 1, int writeComments = 1);
Severity WriteExchangeFile (const char* filename =0, int validate =1,
int clearError = 1, int writeComments = 1);
Severity WriteValuePairsFile(G4std::ostream& out, int validate =1,
Severity WriteValuePairsFile(std::ostream& out, int validate =1,
int clearError =1,
int writeComments = 1, int mixedCase = 1);
Severity WriteWorkingFile (G4std::ostream& out, int clearError = 1,
Severity WriteWorkingFile (std::ostream& out, int clearError = 1,
int writeComments = 1);
Severity WriteWorkingFile (const char* filename =0, int clearError = 1,
int writeComments = 1);
@@ -175,10 +175,10 @@ class STEPfile
char *schemaName( char * ); // returns and copies out schema name from
// header instances
//called by ReadExchangeFile
G4std::istream* OpenInputFile (const char* filename = "");
void CloseInputFile(G4std::istream* in);
std::istream* OpenInputFile (const char* filename = "");
void CloseInputFile(std::istream* in);
Severity ReadHeader(G4std::istream& in);
Severity ReadHeader(std::istream& in);
InstMgr* HeaderConvertToNew(InstMgr& oldinst);
Severity HeaderVerifyInstances(InstMgr* im);
@@ -190,50 +190,50 @@ class STEPfile
int HeaderId (const char* nm ="\0");
int HeaderIdOld (const char* nm ="\0");
int ReadData1 (G4std::istream& in); // first pass to create instances
int ReadData1 (std::istream& in); // first pass to create instances
// second pass to read instances
int ReadData2 (G4std::istream& in, int useTechCor =1);
int ReadData2 (std::istream& in, int useTechCor =1);
// obsolete
int ReadWorkingData1 (G4std::istream& in);
int ReadWorkingData2 (G4std::istream& in, int useTechCor =1);
int ReadWorkingData1 (std::istream& in);
int ReadWorkingData2 (std::istream& in, int useTechCor =1);
void ReadRestOfFile(G4std::istream& in);
void ReadRestOfFile(std::istream& in);
// create instance - used by ReadData1()
SCLP23(Application_instance) * CreateInstance(G4std::istream& in, G4std::ostream& out);
SCLP23(Application_instance) * CreateInstance(std::istream& in, std::ostream& out);
// create complex instance - used by CreateInstance()
SCLP23(Application_instance) * CreateSubSuperInstance(G4std::istream& in, int fileid,
SCLP23(Application_instance) * CreateSubSuperInstance(std::istream& in, int fileid,
ErrorDescriptor &);
// read the instance - used by ReadData2()
SCLP23(Application_instance) * ReadInstance(G4std::istream& in, G4std::ostream& out,
SCLP23(Application_instance) * ReadInstance(std::istream& in, std::ostream& out,
SCLstring &cmtStr, int useTechCor =1);
// reading scopes are still incomplete
// these functions are stubs
Severity CreateScopeInstances(G4std::istream& in, SCLP23(Application_instance_ptr) ** scopelist);
Severity ReadScopeInstances(G4std::istream& in);
// Severity ReadSubSuperInstance(G4std::istream& in);
Severity CreateScopeInstances(std::istream& in, SCLP23(Application_instance_ptr) ** scopelist);
Severity ReadScopeInstances(std::istream& in);
// Severity ReadSubSuperInstance(std::istream& in);
int FindDataSection (G4std::istream& in);
int FindHeaderSection (G4std::istream& in);
int FindDataSection (std::istream& in);
int FindHeaderSection (std::istream& in);
// writing working session files
void WriteWorkingData(G4std::ostream& out, int writeComments = 1);
void WriteWorkingData(std::ostream& out, int writeComments = 1);
//called by WriteExchangeFile
G4std::ofstream* OpenOutputFile(const char* filename =0);
void CloseOutputFile(G4std::ostream* out);
std::ofstream* OpenOutputFile(const char* filename =0);
void CloseOutputFile(std::ostream* out);
void WriteHeader (G4std::ostream& out);
void WriteHeaderInstance (SCLP23(Application_instance) *obj, G4std::ostream& out);
void WriteHeaderInstanceFileName (G4std::ostream& out);
void WriteHeaderInstanceFileDescription (G4std::ostream& out);
void WriteHeaderInstanceFileSchema (G4std::ostream& out);
void WriteHeader (std::ostream& out);
void WriteHeaderInstance (SCLP23(Application_instance) *obj, std::ostream& out);
void WriteHeaderInstanceFileName (std::ostream& out);
void WriteHeaderInstanceFileDescription (std::ostream& out);
void WriteHeaderInstanceFileSchema (std::ostream& out);
void WriteData (G4std::ostream& out, int writeComments = 1);
void WriteValuePairsData(G4std::ostream& out, int writeComments = 1,
void WriteData (std::ostream& out, int writeComments = 1);
void WriteValuePairsData(std::ostream& out, int writeComments = 1,
int mixedCase = 1);
int IncrementFileId (int fileid);
@@ -241,7 +241,7 @@ class STEPfile
void SetFileIdIncrement ();
void MakeBackupFile();
// void ReadWhiteSpace(G4std::istream& in);
// void ReadWhiteSpace(std::istream& in);
};
//inline functions
source/geometry/solids/STEP/include/STEPundefined.h
+4 -4
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPundefined.h,v 1.4 2000/01/21 13:42:33 gcosmo Exp $ */
/* $Id: STEPundefined.h,v 1.5 2003/06/06 17:07:28 gcosmo Exp $ */
#ifdef __O3DB__
#include <OpenOODB.h>
@@ -29,15 +29,15 @@ class SCLundefined {
public:
// INPUT
virtual Severity StrToVal(const char *s, ErrorDescriptor *err);
virtual Severity StrToVal(G4std::istream &in, ErrorDescriptor *err);
virtual Severity StrToVal(std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(const char *s, ErrorDescriptor *err);
virtual Severity STEPread(G4std::istream &in, ErrorDescriptor *err);
virtual Severity STEPread(std::istream &in, ErrorDescriptor *err);
// OUTPUT
virtual const char *asStr(SCLstring &s) const;
virtual const char *STEPwrite(SCLstring &s);
virtual void STEPwrite (G4std::ostream& out =G4cout);
virtual void STEPwrite (std::ostream& out =G4cout);
int set_null ();
int is_null ();
source/geometry/solids/STEP/include/SdaiBinary.h
+5 -5
View File
@@ -25,7 +25,7 @@
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include "g4std/strstream"
#include <strstream>
class ErrorDescriptor;
#include <scl_string.h>
@@ -57,17 +57,17 @@ class SCLP23_NAME(Binary) : public SCLstring
// format for STEP
const char * asStr () const { return chars (); }
void STEPwrite (G4std::ostream& out =G4cout) const;
void STEPwrite (std::ostream& out =G4cout) const;
const char * STEPwrite (SCLstring &s) const;
Severity StrToVal (const char *s, ErrorDescriptor *err);
Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
Severity STEPread (std::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 (G4std::istream &in, ErrorDescriptor *err,
Severity BinaryValidLevel (std::istream &in, ErrorDescriptor *err,
int optional, char *tokenList,
int needDelims = 0, int clearError = 1);
@@ -76,7 +76,7 @@ class SCLP23_NAME(Binary) : public SCLstring
#endif
protected:
Severity ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
Severity ReadBinary(std::istream& in, ErrorDescriptor *err, int AssignVal = 1,
int needDelims = 1);
};
source/geometry/solids/STEP/include/SdaiCONFIG_CONTROL_DESIGN.h
+94 -94
View File
@@ -3,7 +3,7 @@
// This file was generated by fedex_plus. You probably don't want to edit
// it since your modifications will be lost if fedex_plus is used to
// regenerate it.
/* $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.6 2000/06/09 13:55:20 gcosmo Exp $ */
/* $Id: SdaiCONFIG_CONTROL_DESIGN.h,v 1.7 2003/06/06 17:07:29 gcosmo Exp $ */
#ifdef __OSTORE__
#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -1019,11 +1019,11 @@ class SdaiCharacterized_product_definition : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1157,11 +1157,11 @@ class SdaiShape_definition : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1300,11 +1300,11 @@ class SdaiCharacterized_definition : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1415,11 +1415,11 @@ class SdaiChange_request_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1539,11 +1539,11 @@ class SdaiReversible_topology_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1699,11 +1699,11 @@ class SdaiAxis2_placement : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1827,11 +1827,11 @@ class SdaiSpecified_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -1975,11 +1975,11 @@ class SdaiMeasure_value : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2101,11 +2101,11 @@ class SdaiPerson_organization_select : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2218,11 +2218,11 @@ class SdaiPcurve_or_surface : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2343,11 +2343,11 @@ class SdaiClassified_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2480,11 +2480,11 @@ class SdaiVector_or_direction : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2608,11 +2608,11 @@ class SdaiWireframe_model : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2734,11 +2734,11 @@ class SdaiGeometric_set_select : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2857,11 +2857,11 @@ class SdaiStart_request_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -2985,11 +2985,11 @@ class SdaiPerson_organization_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3187,11 +3187,11 @@ class SdaiDate_time_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3382,11 +3382,11 @@ class SdaiShell : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3520,11 +3520,11 @@ class SdaiTransformation : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3647,11 +3647,11 @@ class SdaiBoolean_operand : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3760,11 +3760,11 @@ class SdaiCertified_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -3885,11 +3885,11 @@ class SdaiDate_time_select : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4003,11 +4003,11 @@ class SdaiCurve_on_surface : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4149,11 +4149,11 @@ class SdaiTrimming_select : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4270,11 +4270,11 @@ class SdaiContracted_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4389,11 +4389,11 @@ class SdaiUnit : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4505,11 +4505,11 @@ class SdaiReversible_topology : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4622,11 +4622,11 @@ class SdaiWork_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4743,11 +4743,11 @@ class SdaiSupported_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -4897,11 +4897,11 @@ class SdaiApproved_item : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
@@ -5102,11 +5102,11 @@ class SdaiSurface_model : public SCLP23(Select) {
// STEP Part 21
virtual void STEPwrite_content (G4std::ostream& out =G4cout,
virtual void STEPwrite_content (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout,
virtual void STEPwrite_verbose (std::ostream& out =G4cout,
const char *currSch =0) const;
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0, const char *utype =0,
int addFileId =0, const char *currSch =0);
virtual Severity StrToVal_content (const char *,
source/geometry/solids/STEP/include/Str.h
+2 -2
View File
@@ -13,7 +13,7 @@
* and is not subject to copyright.
*/
/* $Id: Str.h,v 1.4 2000/01/21 13:42:37 gcosmo Exp $ */
/* $Id: Str.h,v 1.5 2003/06/06 17:07:29 gcosmo Exp $ */
#ifdef __O3DB__
#include <OpenOODB.h>
@@ -43,7 +43,7 @@ int StrCmpIns (const char *, const char *);
char * EntityClassName ( char * oldname);
extern Severity CheckRemainingInput
(G4std::istream &in, ErrorDescriptor *err,
(std::istream &in, ErrorDescriptor *err,
const char *typeName, // used in error message
const char *tokenList); // e.g. ",)"
source/geometry/solids/STEP/include/classes.h
+1 -1
View File
@@ -6,7 +6,7 @@
//
// $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
/*
** Fed-x parser output module for generating C++ class definitions
source/geometry/solids/STEP/include/complexSupport.h
+8 -8
View File
@@ -14,8 +14,8 @@
* Date: 5/9/97 *
*****************************************************************************/
#include "g4std/iostream"
#include "g4std/fstream"
#include <iostream>
#include <fstream>
/*
extern "C"
{
@@ -125,8 +125,8 @@ class EntList {
friend class OrList;
friend class ComplexList;
friend class ComplexCollect;
friend G4std::ostream & operator<< ( G4std::ostream &, EntList & );
friend G4std::ostream & operator<< ( G4std::ostream &, MultList & );
friend std::ostream & operator<< ( std::ostream &, EntList & );
friend std::ostream & operator<< ( std::ostream &, MultList & );
public:
// Changed order of member initialisations to match correct order - GC
@@ -171,7 +171,7 @@ class EntList {
class SimpleList : public EntList {
friend class ComplexList;
friend G4std::ostream & operator<< ( G4std::ostream &, SimpleList & );
friend std::ostream & operator<< ( std::ostream &, SimpleList & );
public:
// Changed order of member initialisations to match correct order - GC
@@ -201,7 +201,7 @@ class MultList : public EntList {
friend class ComplexList;
friend class ComplexCollect;
friend G4std::ostream & operator<< ( G4std::ostream &, MultList & );
friend std::ostream & operator<< ( std::ostream &, MultList & );
public:
MultList( JoinType j ) : EntList(j), supertype(0), numchildren(0),
@@ -255,7 +255,7 @@ class AndOrList : public JoinList {
class AndList : public JoinList {
friend class ComplexList;
friend G4std::ostream & operator<< ( G4std::ostream &, ComplexList & );
friend std::ostream & operator<< ( std::ostream &, ComplexList & );
public:
AndList() : JoinList( AND ) {}
@@ -289,7 +289,7 @@ class ComplexList {
friend class MultList;
friend class ComplexCollect;
friend G4std::ostream & operator<< ( G4std::ostream &, ComplexList & );
friend std::ostream & operator<< ( std::ostream &, ComplexList & );
public:
source/geometry/solids/STEP/include/errordesc.h
+7 -7
View File
@@ -13,7 +13,7 @@
* and is not subject to copyright.
*/
/* $Id: errordesc.h,v 1.4 2000/01/21 13:42:39 gcosmo Exp $ */
/* $Id: errordesc.h,v 1.5 2003/06/06 17:07:31 gcosmo Exp $ */
#ifdef __OSTORE__
#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -24,7 +24,7 @@
#endif
#include <scl_string.h>
#include "g4std/iostream"
#include <iostream>
typedef enum Severity {
SEVERITY_MAX = -5,
@@ -63,7 +63,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 G4std::ostream
** detailed message gets sent to std::ostream
** uses SCLstring class to keep the user messages
** keeps severity of error
** created with or without error
@@ -71,13 +71,13 @@ enum DebugLevel {
******************************************************************/
class ErrorDescriptor {
// friend G4std::istream &operator<< ( G4std::istream&, ErrorDescriptor& );
// friend std::istream &operator<< ( std::istream&, ErrorDescriptor& );
protected:
Severity _severity;
static DebugLevel _debug_level;
static G4std::ostream* _out; // note this will not be persistent
static std::ostream* _out; // note this will not be persistent
SCLstring *_userMsg;
SCLstring *_detailMsg;
@@ -87,7 +87,7 @@ class ErrorDescriptor {
DebugLevel d = DEBUG_OFF);
~ErrorDescriptor () { delete _userMsg; delete _detailMsg; }
void PrintContents(G4std::ostream &out = G4cout) const;
void PrintContents(std::ostream &out = G4cout) const;
void ClearErrorMsg() {
_severity = SEVERITY_NULL;
@@ -126,7 +126,7 @@ class ErrorDescriptor {
DebugLevel debug_level() const { return _debug_level; }
void debug_level(DebugLevel d) { _debug_level = d; }
void SetOutput(G4std::ostream *o) { _out = o; }
void SetOutput(std::ostream *o) { _out = o; }
#ifdef __OSTORE__
static os_typespec* get_os_typespec();
source/geometry/solids/STEP/include/read_func.h
+19 -19
View File
@@ -8,11 +8,11 @@
// print Error information for debugging purposes
extern void PrintErrorState(ErrorDescriptor &err);
// print G4std::istream error information for debugging purposes
extern void IStreamState(G4std::istream &in);
// print std::istream error information for debugging purposes
extern void IStreamState(std::istream &in);
extern int
ReadInteger(SCLP23(Integer) &val, G4std::istream &in, ErrorDescriptor *err,
ReadInteger(SCLP23(Integer) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList);
extern int
@@ -27,10 +27,10 @@ extern char *
WriteReal(SCLP23(Real) val, SCLstring &s);
extern void
WriteReal(SCLP23(Real) val, G4std::ostream &out);
WriteReal(SCLP23(Real) val, std::ostream &out);
extern int
ReadReal(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
ReadReal(SCLP23(Real) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList);
extern int
@@ -42,7 +42,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
int clearError, int optional, char *tokenList);
extern int
ReadNumber(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
ReadNumber(SCLP23(Real) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList);
extern int
@@ -56,45 +56,45 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
////////////////////
extern int QuoteInString(G4std::istream& in);
extern int QuoteInString(std::istream& in);
extern void
PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastString (std::istream& in, SCLstring &s, ErrorDescriptor *err);
extern void
PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastImbedAggr (std::istream& in, SCLstring &s, ErrorDescriptor *err);
extern void
PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err);
PushPastAggr1Dim(std::istream& in, SCLstring &s, ErrorDescriptor *err);
////////////////////
extern Severity
FindStartOfInstance(G4std::istream& in, SCLstring& inst);
FindStartOfInstance(std::istream& in, SCLstring& inst);
// used for instances that aren\'t valid - reads to next \';\'
extern Severity
SkipInstance (G4std::istream& in, SCLstring & inst);
SkipInstance (std::istream& in, SCLstring & inst);
extern const char *
SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err);
SkipSimpleRecord(std::istream &in, SCLstring &buf, ErrorDescriptor *err);
// this includes entity names
extern const char *
ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS = 1);
ReadStdKeyword(std::istream& in, SCLstring &buf, int skipInitWS = 1);
extern const char*
GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err);
GetKeyword(std::istream& in, const char* delims, ErrorDescriptor &err);
extern int
FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err);
FoundEndSecKywd(std::istream& in, ErrorDescriptor &err);
extern const char *ReadComment(SCLstring &ss, const char *s);
extern const char *ReadComment(G4std::istream& in, SCLstring &s);
extern const char *ReadComment(std::istream& in, SCLstring &s);
extern Severity ReadPcd(G4std::istream& in); //print control directive
extern Severity ReadPcd(std::istream& in); //print control directive
extern void ReadTokenSeparator(G4std::istream& in, SCLstring *comments = 0);
extern void ReadTokenSeparator(std::istream& in, SCLstring *comments = 0);
#endif
source/geometry/solids/STEP/include/scl_string.h
+2 -2
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: scl_string.h,v 1.4 2000/01/21 13:42:42 gcosmo Exp $ */
/* $Id: scl_string.h,v 1.5 2003/06/06 17:07:31 gcosmo Exp $ */
#ifdef __O3DB__
#include <OpenOODB.h>
@@ -56,7 +56,7 @@ public:
int newBufSize (int len) const;
public:
void PrintContents(G4std::ostream &out = G4cout) const;
void PrintContents(std::ostream &out = G4cout) const;
// returns 1 if _strBuf is a null ptr or if it is an empty string ("")
int is_null() const;
// returns 1 if _strBuf is a null ptr, and 0 otherwise
source/geometry/solids/STEP/include/sdai.h
+2 -2
View File
@@ -18,7 +18,7 @@
* values for the EXPRESS base types.
*/
/* $Id: sdai.h,v 1.4 2000/02/14 13:44:03 gcosmo Exp $ */
/* $Id: sdai.h,v 1.5 2003/06/06 17:07:31 gcosmo Exp $ */
extern const char *SCLversion;
@@ -370,7 +370,7 @@ typedef SCLP23(Application_instance)* STEPentityPtr;
typedef SCLP23(Application_instance)* STEPentityH;
extern SCLP23(Application_instance) *
ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(std::istream &in, ErrorDescriptor *err, char *tokenList,
InstMgr * instances, int addFileId);
#define SdaiInteger SCLP23(Integer)
source/geometry/solids/STEP/include/sdaiApplication_instance.h
+9 -9
View File
@@ -17,7 +17,7 @@
* and is not subject to copyright.
*/
/* $Id: sdaiApplication_instance.h,v 1.1 2000/01/21 13:42:43 gcosmo Exp $ */
/* $Id: sdaiApplication_instance.h,v 1.2 2003/06/06 17:07:31 gcosmo Exp $ */
//#ifdef __OSTORE__
//#include <ostore/ostore.hh> // Required to access ObjectStore Class Library
@@ -148,23 +148,23 @@ class SCLP23_NAME(Application_instance) : public SCLP23_NAME(DAObject_SDAI)
// READ
virtual Severity STEPread(int id, int addFileId,
class InstMgr * instance_set,
G4std::istream& in =G4cin, const char *currSch =NULL,
std::istream& in =G4cin, const char *currSch =NULL,
int useTechCor =1);
virtual void STEPread_error(char c, int index, G4std::istream& in);
virtual void STEPread_error(char c, int index, std::istream& in);
// WRITE
virtual void STEPwrite(G4std::ostream& out =G4cout, const char *currSch =NULL,
virtual void STEPwrite(std::ostream& out =G4cout, const char *currSch =NULL,
int writeComments = 1);
virtual const char * STEPwrite(SCLstring &buf, const char *currSch =NULL);
void WriteValuePairs(G4std::ostream& out, const char *currSch =NULL,
void WriteValuePairs(std::ostream& out, const char *currSch =NULL,
int writeComments = 1, int mixedCase = 1);
void STEPwrite_reference (G4std::ostream& out =G4cout);
void STEPwrite_reference (std::ostream& out =G4cout);
const char * STEPwrite_reference (SCLstring &buf);
void beginSTEPwrite(G4std::ostream& out =G4cout); // writes out the SCOPE section
void endSTEPwrite(G4std::ostream& out =G4cout);
void beginSTEPwrite(std::ostream& out =G4cout); // writes out the SCOPE section
void endSTEPwrite(std::ostream& out =G4cout);
// MULTIPLE INHERITANCE
int MultipleInheritance() { return !(headMiEntity == 0); }
@@ -224,7 +224,7 @@ typedef SCLP23_NAME(Application_instance_ptr) SCLP23_NAME(Application_instance_v
//typedef SCLP23_NAME(Application_instance)* STEPentityH;
//extern SCLP23_NAME(Application_instance) *
//ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList,
//ReadEntityRef(std::istream &in, ErrorDescriptor *err, char *tokenList,
// InstMgr * instances, int addFileId);
//typedef SCLP23_NAME(Application_instance) * (* Creator) () const;
source/geometry/solids/STEP/include/sdaiEnum.h
+9 -9
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: sdaiEnum.h,v 1.1 2000/01/21 13:42:44 gcosmo Exp $ */
/* $Id: sdaiEnum.h,v 1.2 2003/06/06 17:07:32 gcosmo Exp $ */
#if 0
#ifdef PART26
@@ -41,7 +41,7 @@
//class STEPenumeration {
class SCLP23_NAME(Enum) {
friend G4std::ostream &operator<< ( G4std::ostream&, const SCLP23_NAME(Enum)& );
friend std::ostream &operator<< ( std::ostream&, const SCLP23_NAME(Enum)& );
protected:
int v; // integer value of enumeration instance
// mapped to a symbolic value in the elements
@@ -53,7 +53,7 @@ class SCLP23_NAME(Enum) {
public:
void PrintContents(G4std::ostream &out = G4cout) const
void PrintContents(std::ostream &out = G4cout) const
{ DebugDisplay(out); }
virtual int no_elements () const =0;
@@ -65,18 +65,18 @@ class SCLP23_NAME(Enum) {
int optional, char *tokenList,
int needDelims = 0, int clearError = 1);
Severity EnumValidLevel(G4std::istream &in, ErrorDescriptor *err,
Severity EnumValidLevel(std::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 (G4std::ostream& out = G4cout) const;
void STEPwrite (std::ostream& out = G4cout) const;
const char * STEPwrite (SCLstring &s) const;
Severity StrToVal (const char * s, ErrorDescriptor *err, int optional = 1);
Severity STEPread(G4std::istream& in, ErrorDescriptor *err, int optional = 1);
Severity STEPread(std::istream& in, ErrorDescriptor *err, int optional = 1);
Severity STEPread(const char *s, ErrorDescriptor *err, int optional = 1);
virtual int put (int val);
@@ -92,7 +92,7 @@ class SCLP23_NAME(Enum) {
virtual int exists() const; // return 0 if unset otherwise return 1
virtual void nullify(); // change the receiver to an unset status
// unset is generated to be 1 greater than last element
void DebugDisplay (G4std::ostream& out =G4cout) const;
void DebugDisplay (std::ostream& out =G4cout) const;
#ifdef __OSTORE__
static os_typespec* get_os_typespec();
@@ -102,7 +102,7 @@ class SCLP23_NAME(Enum) {
#endif
protected:
virtual Severity ReadEnum(G4std::istream& in, ErrorDescriptor *err,
virtual Severity ReadEnum(std::istream& in, ErrorDescriptor *err,
int AssignVal = 1, int needDelims = 1);
};
@@ -183,7 +183,7 @@ public SCLP23_NAME(Enum) {
protected:
virtual int set_value (const int n);
virtual int set_value (const char * n);
virtual Severity ReadEnum(G4std::istream& in, ErrorDescriptor *err,
virtual Severity ReadEnum(std::istream& in, ErrorDescriptor *err,
int AssignVal = 1, int needDelims = 1);
}
source/geometry/solids/STEP/include/sdaiSelect.h
+6 -6
View File
@@ -12,7 +12,7 @@
* and is not subject to copyright.
*/
/* $Id: sdaiSelect.h,v 1.1 2000/01/21 13:42:45 gcosmo Exp $ */
/* $Id: sdaiSelect.h,v 1.2 2003/06/06 17:07:32 gcosmo Exp $ */
/*
@@ -95,13 +95,13 @@ class SCLP23_NAME(Select) {
// reading and writing
const char * STEPwrite (SCLstring& s, const char *currSch =0) const;
void STEPwrite (G4std::ostream& out =G4cout, const char *currSch =0) const;
void STEPwrite (std::ostream& out =G4cout, const char *currSch =0) const;
// IMS 8/2/95: added as part of new select implementation
virtual void STEPwrite_verbose (G4std::ostream& out =G4cout, const char * =0)
virtual void STEPwrite_verbose (std::ostream& out =G4cout, const char * =0)
const;
virtual void STEPwrite_content (G4std::ostream& out, const char * =0) const =0;
virtual void STEPwrite_content (std::ostream& out, const char * =0) const =0;
// char * asStr() const;
@@ -110,12 +110,12 @@ class SCLP23_NAME(Select) {
virtual Severity StrToVal_content (const char *,
InstMgr * instances =0) =0;
Severity STEPread(G4std::istream& in, ErrorDescriptor *err,
Severity STEPread(std::istream& in, ErrorDescriptor *err,
InstMgr * instances =0, const char* utype =0,
int addFileId =0, const char * =NULL);
// abstract function
virtual Severity STEPread_content (G4std::istream& in =G4cin,
virtual Severity STEPread_content (std::istream& in =G4cin,
InstMgr * instances =0,
const char *utype =0,
int addFileId =0,
source/geometry/solids/STEP/include/sdaiString.h
+3 -3
View File
@@ -11,7 +11,7 @@
* and is not subject to copyright.
*/
/* $Id: sdaiString.h,v 1.1 2000/01/21 13:42:46 gcosmo Exp $ */
/* $Id: sdaiString.h,v 1.2 2003/06/06 17:07:32 gcosmo Exp $ */
/*
#ifdef __OSTORE__
@@ -46,11 +46,11 @@ public:
// format for STEP
const char * asStr (SCLstring & s) const { return s = chars (); }
void STEPwrite (G4std::ostream& out =G4cout) const;
void STEPwrite (std::ostream& out =G4cout) const;
void STEPwrite (SCLstring &s) const;
Severity StrToVal (const char *s);
Severity STEPread (G4std::istream& in, ErrorDescriptor *err);
Severity STEPread (std::istream& in, ErrorDescriptor *err);
Severity STEPread (const char *s, ErrorDescriptor *err);
#ifdef __OSTORE__
source/geometry/solids/STEP/src/ExpDict.cc
+13 -13
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: ExpDict.cc,v 1.6 2000/11/20 18:14:56 gcosmo Exp $ */
/* $Id: ExpDict.cc,v 1.7 2003/06/06 17:07:32 gcosmo Exp $ */
#include <memory.h>
#include <math.h>
#include <stdio.h>
@@ -134,7 +134,7 @@ int Explicit_item_id__set::Index (Explicit_item_id_ptr v) {
Explicit_item_id_ptr& Explicit_item_id__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -226,7 +226,7 @@ int Implicit_item_id__set::Index (Implicit_item_id_ptr v) {
Implicit_item_id_ptr& Implicit_item_id__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -318,7 +318,7 @@ int Interface_spec__set::Index (Interface_spec_ptr v) {
Interface_spec_ptr& Interface_spec__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -406,7 +406,7 @@ Schema::AddProcedure(const char * p)
// the whole schema
void
Schema::GenerateExpress(G4std::ostream& out) const
Schema::GenerateExpress(std::ostream& out) const
{
SCLstring tmp;
out << G4endl << "(* Generating: " << Name() << " *)" << G4endl;
@@ -453,7 +453,7 @@ Schema::GenerateExpress(G4std::ostream& out) const
// USE, REFERENCE definitions
void
Schema::GenerateUseRefExpress(G4std::ostream& out) const
Schema::GenerateUseRefExpress(std::ostream& out) const
{
int i,k;
int intf_count;
@@ -551,7 +551,7 @@ Schema::GenerateUseRefExpress(G4std::ostream& out) const
// TYPE definitions
void
Schema::GenerateTypesExpress(G4std::ostream& out) const
Schema::GenerateTypesExpress(std::ostream& out) const
{
TypeDescItr tdi(_typeList);
tdi.ResetItr();
@@ -567,7 +567,7 @@ Schema::GenerateTypesExpress(G4std::ostream& out) const
// Entity definitions
void
Schema::GenerateEntitiesExpress(G4std::ostream& out) const
Schema::GenerateEntitiesExpress(std::ostream& out) const
{
EntityDescItr edi(_entList);
edi.ResetItr();
@@ -1282,13 +1282,13 @@ EntityDescriptor::FindLongestAttribute()
while( attrPtr != 0)
{
if(attrPtr->AttrDesc()->IsEntityType())
maxAttrLen = G4std::max(maxAttrLen,
maxAttrLen = std::max(maxAttrLen,
(strlen(attrPtr->AttrDesc()->EntityType()->Name()) +
strlen(attrPtr->AttrDesc()->Name()) + 3
)
);
else
maxAttrLen = G4std::max(maxAttrLen,
maxAttrLen = std::max(maxAttrLen,
(strlen(attrPtr->AttrDesc()->DomainType()->NameOrDescription()) +
strlen(attrPtr->AttrDesc()->Name()) + 3
)
@@ -1402,7 +1402,7 @@ int Where_rule__list::Index (Where_rule_ptr v) {
Where_rule_ptr& Where_rule__list::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -1513,7 +1513,7 @@ int Uniqueness_rule__set::Index (Uniqueness_rule_ptr v) {
Uniqueness_rule_ptr& Uniqueness_rule__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -1641,7 +1641,7 @@ int Global_rule__set::Index (Global_rule_ptr v) {
Global_rule_ptr& Global_rule__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
source/geometry/solids/STEP/src/STEPaggregate.cc
+53 -53
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPaggregate.cc,v 1.5 2000/11/20 18:14:57 gcosmo Exp $ */
/* $Id: STEPaggregate.cc,v 1.6 2003/06/06 17:07:32 gcosmo Exp $ */
#include <stdio.h>
@@ -25,7 +25,7 @@ const int Real_Num_Precision = REAL_NUM_PRECISION; // from STEPattribute.h
#define STRING_DELIM '\''
// static char rcsid[] = "$Id: STEPaggregate.cc,v 1.5 2000/11/20 18:14:57 gcosmo Exp $";
// static char rcsid[] = "$Id: STEPaggregate.cc,v 1.6 2003/06/06 17:07:32 gcosmo Exp $";
/******************************************************************
** Functions for manipulating aggregate attributes
@@ -72,7 +72,7 @@ STEPaggregate::AggrValidLevel(const char *value, ErrorDescriptor *err,
if(clearError)
err->ClearErrorMsg();
G4std::istrstream in ((char *)value); // sz defaults to length of s
std::istrstream in ((char *)value); // sz defaults to length of s
ReadValue(in, err, elem_type, insts, addFileId, 0, 0);
CheckRemainingInput(in, err, elem_type->AttrTypeName(buf), tokenList);
@@ -83,7 +83,7 @@ STEPaggregate::AggrValidLevel(const char *value, ErrorDescriptor *err,
// require exchange file format
Severity
STEPaggregate::AggrValidLevel(G4std::istream &in, ErrorDescriptor *err,
STEPaggregate::AggrValidLevel(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int optional, char *tokenList, int addFileId,
int clearError)
@@ -102,7 +102,7 @@ STEPaggregate::AggrValidLevel(G4std::istream &in, ErrorDescriptor *err,
// if exchangeFileFormat == 1 then paren delims are required.
Severity
STEPaggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
STEPaggregate::ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int addFileId, int assignVal, int exchangeFileFormat,
const char *)
@@ -118,7 +118,7 @@ STEPaggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
char c;
int validDelims = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
c = in.peek(); // does not advance input
@@ -148,7 +148,7 @@ STEPaggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
STEPnode * item = 0;
in >> G4std::ws;
in >> std::ws;
// take a peek to see if there are any elements before committing to an
// element
c = in.peek(); // does not advance input
@@ -188,7 +188,7 @@ STEPaggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
if(assignVal) // pass the node to STEPaggregate
AddNode (item);
in >> G4std::ws; // skip white space (although should already be skipped)
in >> std::ws; // skip white space (although should already be skipped)
in.get(c); // read delim
// CheckRemainingInput should have left the input right at the delim
@@ -237,14 +237,14 @@ STEPaggregate::StrToVal(const char *s, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int addFileId)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return ReadValue(in, err, elem_type, insts, addFileId, 1, 0);
}
///////////////////////////////////////////////////////////////////////////////
Severity
STEPaggregate::STEPread(G4std::istream& in, ErrorDescriptor *err,
STEPaggregate::STEPread(std::istream& in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int addFileId, const char *currSch)
{
@@ -273,7 +273,7 @@ STEPaggregate::asStr(SCLstring & s) const
}
void
STEPaggregate::STEPwrite(G4std::ostream& out, const char *currSch) const
STEPaggregate::STEPwrite(std::ostream& out, const char *currSch) const
{
if(!_null)
{
@@ -335,7 +335,7 @@ STEPnode::StrToVal(const char *s, ErrorDescriptor *err)
}
Severity
STEPnode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
STEPnode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
// defined in subtypes
G4cerr << "Internal error: " << __FILE__ << ": " << __LINE__ << "\n" ;
@@ -367,7 +367,7 @@ STEPnode::STEPread(const char *s, ErrorDescriptor *err)
}
Severity
STEPnode::STEPread(G4std::istream &in, ErrorDescriptor *err)
STEPnode::STEPread(std::istream &in, ErrorDescriptor *err)
{
G4cerr << "Internal error: " << __FILE__ << ": " << __LINE__ << "\n" ;
G4cerr << "function: STEPnode::STEPread called instead of virtual function.\n"
@@ -418,7 +418,7 @@ STEPnode::STEPwrite (SCLstring &s, const char *currSch)
}
void
STEPnode::STEPwrite (G4std::ostream& out)
STEPnode::STEPwrite (std::ostream& out)
{
G4cerr << "Internal error: " << __FILE__ << ": " << __LINE__ << "\n" ;
G4cerr << "function: STEPnode::STEPwrite called instead of virtual function.\n"
@@ -517,7 +517,7 @@ GenericAggrNode::StrToVal(const char *s, ErrorDescriptor *err)
//TODO
Severity
GenericAggrNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
GenericAggrNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -525,12 +525,12 @@ GenericAggrNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity
GenericAggrNode::STEPread(const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *) s);
std::istrstream in((char *) s);
return value.STEPread(in, err);
}
Severity
GenericAggrNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
GenericAggrNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -557,7 +557,7 @@ GenericAggrNode::STEPwrite(SCLstring &s, const char *currSch)
}
void
GenericAggrNode::STEPwrite (G4std::ostream& out)
GenericAggrNode::STEPwrite (std::ostream& out)
{
value.STEPwrite(out);
}
@@ -579,7 +579,7 @@ EntityAggregate::~EntityAggregate ()
// if exchangeFileFormat == 1 then delims are required.
Severity
EntityAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
EntityAggregate::ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int addFileId, int assignVal,
int exchangeFileFormat, const char *)
@@ -595,7 +595,7 @@ EntityAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
char c;
int validDelims = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
c = in.peek(); // does not advance input
@@ -625,7 +625,7 @@ EntityAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
EntityNode * item = 0;
in >> G4std::ws;
in >> std::ws;
// take a peek to see if there are any elements before committing to an
// element
c = in.peek(); // does not advance input
@@ -671,7 +671,7 @@ EntityAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
if(assignVal)
AddNode (item);
in >> G4std::ws; // skip white space (although should already be skipped)
in >> std::ws; // skip white space (although should already be skipped)
in.get(c); // read delim
// CheckRemainingInput should have left the input right at the delim
@@ -806,7 +806,7 @@ EntityNode::StrToVal(const char *s, ErrorDescriptor *err,
}
Severity
EntityNode::StrToVal(G4std::istream &in, ErrorDescriptor *err,
EntityNode::StrToVal(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId)
{
@@ -818,12 +818,12 @@ EntityNode::STEPread(const char *s, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return STEPread(in, err, elem_type, insts, addFileId);
}
Severity
EntityNode::STEPread(G4std::istream &in, ErrorDescriptor *err,
EntityNode::STEPread(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId)
{
@@ -876,7 +876,7 @@ EntityNode::STEPwrite(SCLstring &s, const char *)
}
void
EntityNode::STEPwrite(G4std::ostream& out)
EntityNode::STEPwrite(std::ostream& out)
{
if (!node || (node == S_ENTITY_NULL)) // nothing
out << "$";
@@ -902,7 +902,7 @@ SelectAggregate::~SelectAggregate ()
// if exchangeFileFormat == 1 then delims are required.
Severity
SelectAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
SelectAggregate::ReadValue(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type, InstMgr *insts,
int addFileId, int assignVal,
int exchangeFileFormat, const char *currSch)
@@ -918,7 +918,7 @@ SelectAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
char c;
int validDelims = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
c = in.peek(); // does not advance input
@@ -948,7 +948,7 @@ SelectAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
SelectNode * item = 0;
in >> G4std::ws;
in >> std::ws;
// take a peek to see if there are any elements before committing to an
// element
c = in.peek(); // does not advance input
@@ -989,7 +989,7 @@ SelectAggregate::ReadValue(G4std::istream &in, ErrorDescriptor *err,
if(assignVal)
AddNode (item);
in >> G4std::ws; // skip white space (although should already be skipped)
in >> std::ws; // skip white space (although should already be skipped)
in.get(c); // read delim
// CheckRemainingInput should have left the input right at the delim
@@ -1105,14 +1105,14 @@ SelectNode::StrToVal(const char *s, ErrorDescriptor *err,
node = S_ENTITY_NULL;
*/
// KC you will have to decide what to do here
G4std::istrstream in((char*)s);
std::istrstream in((char*)s);
if (err->severity( node->STEPread(in, err, insts) ) != SEVERITY_NULL)
err->AppendToDetailMsg (node ->Error ());
return err->severity();
}
Severity
SelectNode::StrToVal(G4std::istream &in, ErrorDescriptor *err,
SelectNode::StrToVal(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId, const char *currSch)
{
@@ -1124,12 +1124,12 @@ SelectNode::STEPread(const char *s, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return STEPread(in, err, elem_type, insts, addFileId);
}
Severity
SelectNode::STEPread(G4std::istream &in, ErrorDescriptor *err,
SelectNode::STEPread(std::istream &in, ErrorDescriptor *err,
const TypeDescriptor *elem_type,
InstMgr *insts, int addFileId, const char *currSch)
{
@@ -1171,7 +1171,7 @@ SelectNode::STEPwrite(SCLstring &s, const char *currSch)
}
void
SelectNode::STEPwrite(G4std::ostream& out)
SelectNode::STEPwrite(std::ostream& out)
{
if ( !node || (node->is_null()) ) // nothing
out << "$";
@@ -1291,7 +1291,7 @@ StringNode::StrToVal(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
StringNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
StringNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -1301,7 +1301,7 @@ StringNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity
StringNode::STEPread(const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
value.STEPread(in, err);
CheckRemainingInput(in, err, "string", ",)");
@@ -1311,7 +1311,7 @@ StringNode::STEPread(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
StringNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
StringNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -1333,7 +1333,7 @@ StringNode::STEPwrite (SCLstring &s, const char *)
}
void
StringNode::STEPwrite (G4std::ostream& out)
StringNode::STEPwrite (std::ostream& out)
{
value.STEPwrite(out);
}
@@ -1442,7 +1442,7 @@ BinaryNode::StrToVal(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
BinaryNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
BinaryNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -1453,7 +1453,7 @@ BinaryNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity
BinaryNode::STEPread(const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
value.STEPread(in, err);
CheckRemainingInput(in, err, "binary", ",)");
@@ -1463,7 +1463,7 @@ BinaryNode::STEPread(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
BinaryNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
BinaryNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
return value.STEPread(in, err);
}
@@ -1483,7 +1483,7 @@ BinaryNode::STEPwrite (SCLstring &s, const char *)
}
void
BinaryNode::STEPwrite (G4std::ostream& out)
BinaryNode::STEPwrite (std::ostream& out)
{
value.STEPwrite(out);
}
@@ -1659,7 +1659,7 @@ EnumNode::StrToVal(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
EnumNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
EnumNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
return node->STEPread(in, err);
}
@@ -1670,7 +1670,7 @@ EnumNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity
EnumNode::STEPread(const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *)s); // sz defaults to length of s
std::istrstream in((char *)s); // sz defaults to length of s
int nullable = 0;
node->STEPread (in, err, nullable);
@@ -1681,7 +1681,7 @@ EnumNode::STEPread(const char *s, ErrorDescriptor *err)
// this function assumes you will check for garbage following input
Severity
EnumNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
EnumNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
int nullable = 0;
node->STEPread (in, err, nullable);
@@ -1721,7 +1721,7 @@ EnumNode::STEPwrite (SCLstring &s, const char *)
}
void
EnumNode::STEPwrite (G4std::ostream& out)
EnumNode::STEPwrite (std::ostream& out)
{
// out << '.' << asStr() << '.';
node->STEPwrite(out);
@@ -1931,7 +1931,7 @@ RealNode::StrToVal(const char *s, ErrorDescriptor *err)
}
Severity
RealNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
RealNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
if( ReadReal(value, in, err, (char*)(",)")) ) // returns true if value is assigned
_null = 0;
@@ -1958,7 +1958,7 @@ RealNode::STEPread(const char *s, ErrorDescriptor *err)
}
Severity
RealNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
RealNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
if( ReadReal(value, in, err, (char*)(",)")) ) // returns true if value is assigned
_null = 0;
@@ -1994,7 +1994,7 @@ RealNode::STEPwrite(SCLstring &s, const char *)
}
void
RealNode::STEPwrite(G4std::ostream& out)
RealNode::STEPwrite(std::ostream& out)
{
SCLstring s;
out << STEPwrite(s);
@@ -2038,7 +2038,7 @@ IntNode::StrToVal(const char *s, ErrorDescriptor *err)
}
Severity
IntNode::StrToVal(G4std::istream &in, ErrorDescriptor *err)
IntNode::StrToVal(std::istream &in, ErrorDescriptor *err)
{
if( ReadInteger(value, in, err, (char*)(",)")) )// returns true if value is assigned
_null = 0;
@@ -2064,7 +2064,7 @@ IntNode::STEPread(const char *s, ErrorDescriptor *err)
}
Severity
IntNode::STEPread(G4std::istream &in, ErrorDescriptor *err)
IntNode::STEPread(std::istream &in, ErrorDescriptor *err)
{
if( ReadInteger(value, in, err, (char*)(",)")) ) // returns true if value is assigned
_null = 0;
@@ -2098,7 +2098,7 @@ IntNode::STEPwrite(SCLstring &s, const char *)
}
void
IntNode::STEPwrite(G4std::ostream& out)
IntNode::STEPwrite(std::ostream& out)
{
SCLstring s;
out << STEPwrite(s);
source/geometry/solids/STEP/src/STEPattribute.cc
+18 -40
View File
@@ -9,17 +9,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPattribute.cc,v 1.5 2000/01/21 13:42:56 gcosmo Exp $ */
//static char rcsid[] ="$Id: STEPattribute.cc,v 1.5 2000/01/21 13:42:56 gcosmo Exp $";
// Added inclusion of 'stream.h' for non-ISO setup - GC
#ifndef G4USE_STD_NAMESPACE
#ifndef WIN32
#include <stream.h>
#endif
#endif
/* $Id: STEPattribute.cc,v 1.6 2003/06/06 17:07:32 gcosmo Exp $ */
#include <read_func.h>
#include <STEPattribute.h>
@@ -114,7 +104,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
return _error.severity (SEVERITY_INPUT_ERROR);
}
G4std::istrstream in ((char *)s); // sz defaults to length of s
std::istrstream in ((char *)s); // sz defaults to length of s
int valAssigned = 0;
// read in value for attribute
@@ -203,7 +193,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
** Returns: Severity, which indicates success, or failure
** value >= SEVERITY_WARNING means program can continue parsing input,
** value <= SEVERITY_INPUT_ERROR is fatal read error
** Description: the value of the attribute is read from G4std::istream
** Description: the value of the attribute is read from std::istream
** the format expected is STEP exchange file
** modified to accept '$' as value for OPTIONAL ATTRIBUTE,
** (since this function is used for reading files in both
@@ -214,7 +204,7 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
// the delim separating the last attribute from the end of the entity (')').
Severity
STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId,
STEPattribute::STEPread (std::istream& in, InstMgr * instances, int addFileId,
const char *currSch)
{
char errStr[BUFSIZ];
@@ -232,7 +222,7 @@ STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId,
// set the value to be null (reinitialize the attribute value)
set_null();
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
in >> c;
in.putback (c); // leave input stream alone
@@ -246,7 +236,7 @@ STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId,
{
if(c == '*')
{
in.get(c); // take * off the G4std::istream
in.get(c); // take * off the std::istream
_error.severity(SEVERITY_WARNING);
sprintf(errStr, " WARNING: attribute %s of type %s, %s",
aDesc->Name(), aDesc->TypeName(),
@@ -269,7 +259,7 @@ STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId,
{
if(c == '*')
{
in.get(c); // take * off the G4std::istream
in.get(c); // take * off the std::istream
_error.severity(SEVERITY_NULL);
}
else
@@ -309,7 +299,7 @@ STEPattribute::STEPread (G4std::istream& in, InstMgr * instances, int addFileId,
/*
case '*':
{
in.get(c); // take * off the G4std::istream
in.get(c); // take * off the std::istream
if( IsDerived() )
_error.severity(SEVERITY_NULL);
else if( aDesc->AttrType() == AttrType_Redefining )
@@ -556,7 +546,7 @@ STEPattribute::asStr (SCLstring& str, const char *currSch) const
// The output is in physical file format.
void
STEPattribute::STEPwrite (G4std::ostream& out, const char *currSch)
STEPattribute::STEPwrite (std::ostream& out, const char *currSch)
{
// The attribute has been derived by a subtype's attribute
if ( IsDerived() ) {
@@ -1084,13 +1074,13 @@ STEPattribute::ValidLevel (const char *attrValue, ErrorDescriptor *error,
/******************************************************************
** Procedure: operator <<
** Parameters: G4std::ostream & out -- output stream
** Parameters: std::ostream & out -- output stream
** STEPattribute & a -- attribute to output
** Returns: G4std::ostream &
** Returns: std::ostream &
** Description: overloads the output operator to print an attribute
******************************************************************/
G4std::ostream &operator<< ( G4std::ostream& out, STEPattribute& a )
std::ostream &operator<< ( std::ostream& out, STEPattribute& a )
{
a.STEPwrite (out);
return out;
@@ -1138,19 +1128,13 @@ STEPattribute::AddErrorInfo()
// if it hits one of StopChars it puts it back.
// RETURNS: the last char it read.
char
STEPattribute::SkipBadAttr(G4std::istream& in, char *StopChars)
STEPattribute::SkipBadAttr(std::istream& in, char *StopChars)
{
// turn skipping whitespace off
#ifdef G4USE_STD_NAMESPACE
in.unsetf(G4std::ios::skipws);
#else
#ifndef WIN32
int sk = in.skip(0);
#endif
#endif
// turn skipping whitespace off
in.unsetf(std::ios::skipws);
// read bad data until end of this attribute or entity.
// read bad data until end of this attribute or entity.
char *foundCh = 0;
char c = '\0';
char errStr[BUFSIZ];
@@ -1176,14 +1160,8 @@ STEPattribute::SkipBadAttr(G4std::istream& in, char *StopChars)
}
in.putback (c);
// set skip whitespace to its original state
#ifdef G4USE_STD_NAMESPACE
in.setf(G4std::ios::skipws);
#else
#ifndef WIN32
in.skip(sk);
#endif
#endif
// set skip whitespace to its original state
in.setf(std::ios::skipws);
return c;
}
source/geometry/solids/STEP/src/STEPcomplex.cc
+19 -19
View File
@@ -6,7 +6,7 @@
#include <STEPattribute.h>
extern const char *
ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS);
ReadStdKeyword(std::istream& in, SCLstring &buf, int skipInitWS);
#ifdef WIN32
typedef SDAI::Application_instance StepApplicationInstanceType;
@@ -309,7 +309,7 @@ STEPcomplex::AppendEntity(STEPcomplex *stepc)
// READ
Severity
STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
G4std::istream& in, const char *currSch, int useTechCor)
std::istream& in, const char *currSch, int useTechCor)
{
char c;
SCLstring typeNm;
@@ -325,18 +325,18 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
stepc = stepc->sc;
}
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == '(') // opening paren for subsuperRecord
{
in >> G4std::ws;
in >> std::ws;
c = in.peek();
while(c != ')')
{
typeNm.set_null();
in >> G4std::ws;
in >> std::ws;
ReadStdKeyword(in, typeNm, 1); // read the type name
in >> G4std::ws;
in >> std::ws;
c = in.peek();
if(c != '(')
{
@@ -369,7 +369,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
STEPread_error(c,0,in);
return _error.severity();
}
in >> G4std::ws;
in >> std::ws;
c = in.peek();
}
if(c != ')')
@@ -385,7 +385,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
// READ
Severity
STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
G4std::istream& in, const char *currSch)
std::istream& in, const char *currSch)
{
ClearError(1);
STEPfile_id = id;
@@ -398,12 +398,12 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
}
char c;
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == '(')
{
SCLstring s;
in >> G4std::ws;
in >> std::ws;
in.get(c);
while( in && (c != '(') && !isspace(c) ) // get the entity name
{
@@ -412,7 +412,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
}
if(isspace(c))
{
in >> G4std::ws;
in >> std::ws;
in.get(c);
}
// STEPcomplex *EntityPart(const char *name);
@@ -434,7 +434,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
SCLP23(Application_instance)::STEPread(id, addFileId, instance_set,
in, currSch);
in >> G4std::ws;
in >> std::ws;
in.get(c);
while(c != ')')
{
@@ -446,7 +446,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
}
if(isspace(c))
{
in >> G4std::ws;
in >> std::ws;
in.get(c);
}
if(c != '(')
@@ -469,7 +469,7 @@ STEPcomplex::STEPread(int id, int addFileId, class InstMgr * instance_set,
stepc->SCLP23(Application_instance)::STEPread(id, addFileId,
instance_set, in,
currSch);
in >> G4std::ws;
in >> std::ws;
in.get(c);
}
}
@@ -599,7 +599,7 @@ STEPcomplex::BuildAttrs(const char *s )
}
void
STEPcomplex::STEPread_error(char c, int index, G4std::istream& in)
STEPcomplex::STEPread_error(char c, int index, std::istream& in)
{
G4cout << "STEPcomplex::STEPread_error() \n";
}
@@ -614,7 +614,7 @@ STEPcomplex::STEPread_error(char c, int index, G4std::istream& in)
// original names but not according to their renamed names (DAR 6/5/97).
void
STEPcomplex::STEPwrite(G4std::ostream& out, const char *currSch, int writeComment)
STEPcomplex::STEPwrite(std::ostream& out, const char *currSch, int writeComment)
{
if(writeComment && p21Comment && !p21Comment->is_null() )
out << p21Comment->chars();
@@ -637,11 +637,11 @@ STEPcomplex::STEPwrite(SCLstring &buf, const char *currSch)
sprintf(instanceInfo, "#%d=", STEPfile_id );
*/
/*
G4std::strstream ss;
std::strstream ss;
ss << "#" << STEPfile_id << "=(";
WriteExtMapEntities(ss, currSch);
ss << ");";
ss << G4std::ends;
ss << std::ends;
char *tmpstr = ss.str();
buf.Append(tmpstr);
@@ -654,7 +654,7 @@ STEPcomplex::STEPwrite(SCLstring &buf, const char *currSch)
}
void
STEPcomplex::WriteExtMapEntities(G4std::ostream& out, const char *currSch)
STEPcomplex::WriteExtMapEntities(std::ostream& out, const char *currSch)
{
SCLstring tmp;
out << StrToUpper (EntityName( currSch ), tmp);
source/geometry/solids/STEP/src/STEPfile.cc
+64 -64
View File
@@ -14,7 +14,7 @@ int pr_obj_errors = 0;
* and is not subject to copyright.
*/
/* $Id: STEPfile.cc,v 1.5 2000/11/20 18:14:58 gcosmo Exp $ */
/* $Id: STEPfile.cc,v 1.6 2003/06/06 17:07:32 gcosmo Exp $ */
/********************************************************************
TODO LIST:
@@ -34,7 +34,7 @@ int pr_obj_errors = 0;
#include <s_HEADER_SCHEMA.h>
// STEPundefined contains
// void PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
// void PushPastString (std::istream& in, SCLstring &s, ErrorDescriptor *err)
#include <STEPundefined.h>
/***************************
@@ -77,21 +77,21 @@ STEPfile::SetFileName (const char* newName)
/***************************
function: ReadHeader
returns: Severity
parameters: (G4std::istream&) The input stream from which the file is read.
parameters: (std::istream&) The input stream from which the file is read.
description:
This function reads in the header section of an exchange file. It
can read it in either version (N279) or (Part 21, July 1992). It
parses the header section, popluates the _headerInstances, and
returns an error descriptor.
It expects to find the "HEADER;" symbol at the beginning of the
G4std::istream.
std::istream.
side effects: The function gobbles all characters up to and including the
next "ENDSEC;" from in.
The STEPfile::_headerInstances may change.
***************************/
Severity
STEPfile::ReadHeader (G4std::istream& in)
STEPfile::ReadHeader (std::istream& in)
{
SCLstring cmtStr;
@@ -127,7 +127,7 @@ STEPfile::ReadHeader (G4std::istream& in)
}
//check for user defined instances
//if it is userDefined, the '!' does not get put back on the G4std::istream
//if it is userDefined, the '!' does not get put back on the std::istream
in.get(c);
if (c == '!') { userDefined = 1; }
else { in.putback(c); }
@@ -209,12 +209,12 @@ STEPfile::ReadHeader (G4std::istream& in)
break;
}
//read the values from the G4std::istream
//read the values from the std::istream
objsev = obj->STEPread(fileid,0,(InstMgr*)0,in);
if( !cmtStr.is_null() )
obj->AddP21Comment(cmtStr);
in >> G4std::ws;
in >> std::ws;
c = in.peek(); // check for semicolon or keyword 'ENDSEC'
if(c != 'E')
in >> c; // read the semicolon
@@ -602,7 +602,7 @@ STEPfile::EntityWfState(char c)
// starts at the data section
int
STEPfile::ReadData1(G4std::istream& in)
STEPfile::ReadData1(std::istream& in)
{
int endsec = 0;
_entsNotCreated = 0;
@@ -713,7 +713,7 @@ STEPfile::ReadData1(G4std::istream& in)
{
int x = 0;
G4cout <<
"\nSTEPfile::ReadData1(G4std::istream& in) os_database ptrs in entities:"
"\nSTEPfile::ReadData1(std::istream& in) os_database ptrs in entities:"
<< G4endl;
SCLP23(Application_instance) *STEPent = 0;
while (x < instance_count)
@@ -751,7 +751,7 @@ STEPfile::ReadData1(G4std::istream& in)
#if bzpoibujqoiwejsdlfj
int
STEPfile::ReadData1(G4std::istream& in)
STEPfile::ReadData1(std::istream& in)
{
int endsec = 0;
_entsNotCreated = 0;
@@ -907,7 +907,7 @@ STEPfile::ReadData1(G4std::istream& in)
#endif
int
STEPfile::ReadWorkingData1 (G4std::istream& in)
STEPfile::ReadWorkingData1 (std::istream& in)
{
return ReadData1(in);
@@ -965,7 +965,7 @@ STEPfile::ReadWorkingData1 (G4std::istream& in)
return instance_count;
}
in >> G4std::ws;
in >> std::ws;
in >> c;
if( c != ENTITY_NAME_DELIM)
{
@@ -1053,13 +1053,13 @@ STEPfile::ReadWorkingData1 (G4std::istream& in)
/******************************************************************
** Procedure: ReadData2
** Parameters: G4std::istream
** Parameters: std::istream
** Returns: number of valid instances read
** Description: reads in the data portion of the instances
** in an exchange file
******************************************************************/
int
STEPfile::ReadData2 (G4std::istream& in, int useTechCor)
STEPfile::ReadData2 (std::istream& in, int useTechCor)
{
_entsInvalid = 0;
_entsIncomplete = 0;
@@ -1201,7 +1201,7 @@ STEPfile::ReadData2 (G4std::istream& in, int useTechCor)
#if xpqosdblkxfnvkbybbbbb
int
STEPfile::ReadData2 (G4std::istream& in)
STEPfile::ReadData2 (std::istream& in)
{
_entsInvalid = 0;
_entsIncomplete = 0;
@@ -1347,7 +1347,7 @@ STEPfile::ReadData2 (G4std::istream& in)
#ifdef junk
// old version 8/23/94
int
STEPfile::ReadData2 (G4std::istream& in)
STEPfile::ReadData2 (std::istream& in)
{
_errorCount = 0; // reset error count
_warningCount = 0; // reset error count
@@ -1394,7 +1394,7 @@ STEPfile::ReadData2 (G4std::istream& in)
#endif
int
STEPfile::ReadWorkingData2 (G4std::istream& in, int useTechCor)
STEPfile::ReadWorkingData2 (std::istream& in, int useTechCor)
{
return ReadData2 (in, useTechCor);
#ifdef junk
@@ -1477,7 +1477,7 @@ STEPfile::ReadWorkingData2 (G4std::istream& in, int useTechCor)
*/
int
STEPfile::FindDataSection (G4std::istream& in)
STEPfile::FindDataSection (std::istream& in)
{
ErrorDescriptor errs;
SCLP23(String) tmp;
@@ -1508,7 +1508,7 @@ STEPfile::FindDataSection (G4std::istream& in)
if (c == 'A')
{
in.get(c); // read 'A'
in >> G4std::ws; // may want to skip comments or print control directives?
in >> std::ws; // may want to skip comments or print control directives?
c = in.peek(); // look for semicolon
if (c == ';')
{
@@ -1541,7 +1541,7 @@ STEPfile::FindDataSection (G4std::istream& in)
}
int
STEPfile::FindHeaderSection (G4std::istream& in)
STEPfile::FindHeaderSection (std::istream& in)
{
char buf[BUFSIZ];
char *b = buf;
@@ -1570,23 +1570,23 @@ STEPfile::FindHeaderSection (G4std::istream& in)
/***************************
description:
This function creates an instance based on the KEYWORD
read from the G4std::istream.
read from the std::istream.
It expects an ENTITY_NAME (int) from the first set of
characters on the G4std::istream. If the (int) is not found,
characters on the std::istream. If the (int) is not found,
ENTITY_NULL is returned.
side effects:
The function leaves the G4std::istream set to the end of the stream
The function leaves the std::istream set to the end of the stream
of characters representing the ENTITY_INSTANCE. It attempts to
recover on errors by reading up to and including the next ';'.
an ENTITY_INSTANCE consists of:
'#'(int)'=' [SCOPE] SIMPLE_RECORD ';' ||
'#'(int)'=' [SCOPE] SUBSUPER_RECORD ';'
The '#' is read from the G4std::istream before CreateInstance is called.
The '#' is read from the std::istream before CreateInstance is called.
***************************/
SCLP23(Application_instance) *
STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out)
STEPfile::CreateInstance(std::istream& in, std::ostream &out)
{
SCLstring tmpbuf;
SCLstring objnm;
@@ -1627,7 +1627,7 @@ STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out)
}
ReadTokenSeparator(in);
c = in.peek(); // peek at the next character on the G4std::istream
c = in.peek(); // peek at the next character on the std::istream
//check for optional "&SCOPE" construct
if (c == '&') // TODO check this out
@@ -1636,7 +1636,7 @@ STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out)
if (s < SEVERITY_WARNING)
{ return ENTITY_NULL; }
ReadTokenSeparator(in);
c = in.peek(); // peek at next char on G4std::istream again
c = in.peek(); // peek at next char on std::istream again
}
//check for subtype/supertype record
@@ -1751,15 +1751,15 @@ STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out)
instance to the instance manager.
side-effects:
It first searches for "&SCOPE" and reads all characters
from the G4std::istream up to and including "ENDSCOPE"
from the std::istream up to and including "ENDSCOPE"
returns: ErrorDescriptor
>= SEVERITY_WARNING: the G4std::istream was read up to and including the
>= SEVERITY_WARNING: the std::istream was read up to and including the
"ENDSCOPE" and the export list /#1, ... #N/
< SEVERITY_WARNING: the G4std::istream was read up to and including the next ";"
< SEVERITY_WARNING: the std::istream was read up to and including the next ";"
< SEVERITY_BUG: fatal
**************************************************/
Severity
STEPfile::CreateScopeInstances(G4std::istream& in, SCLP23(Application_instance_ptr) ** scopelist)
STEPfile::CreateScopeInstances(std::istream& in, SCLP23(Application_instance_ptr) ** scopelist)
{
Severity rval = SEVERITY_NULL;
SCLP23(Application_instance) * se;
@@ -1860,7 +1860,7 @@ STEPfile::CreateScopeInstances(G4std::istream& in, SCLP23(Application_instance_p
}
SCLP23(Application_instance) *
STEPfile::CreateSubSuperInstance(G4std::istream& in, int fileid, ErrorDescriptor &e)
STEPfile::CreateSubSuperInstance(std::istream& in, int fileid, ErrorDescriptor &e)
{
SCLstring tmpstr;
SCLP23(Application_instance) * obj = ENTITY_NULL;
@@ -1876,7 +1876,7 @@ STEPfile::CreateSubSuperInstance(G4std::istream& in, int fileid, ErrorDescriptor
SCLstring *entNmArr[enaSize]; // array of entity type names
int enaIndex = 0;
in >> G4std::ws;
in >> std::ws;
in.get(c); // read the open paren
c = in.peek(); // see if you have closed paren (ending the record)
while(in.good() && (c != ')') && (enaIndex < enaSize) )
@@ -1894,7 +1894,7 @@ STEPfile::CreateSubSuperInstance(G4std::istream& in, int fileid, ErrorDescriptor
buf.set_null();
enaIndex++;
}
in >> G4std::ws;
in >> std::ws;
c = in.peek(); // see if you have closed paren (ending the record)
// If someone separates the entities with commas (or some other
// garbage or a comment) this will keep the read function from
@@ -1932,13 +1932,13 @@ STEPfile::CreateSubSuperInstance(G4std::istream& in, int fileid, ErrorDescriptor
/**************************************************
description:
This function reads the SCOPE list for an entity instance,
and reads the values for each instance from the G4std::istream.
and reads the values for each instance from the std::istream.
side-effects:
It first searches for "&SCOPE" and reads all characters
from the G4std::istream up to and including "ENDSCOPE"
from the std::istream up to and including "ENDSCOPE"
**************************************************/
Severity
STEPfile::ReadScopeInstances (G4std::istream& in)
STEPfile::ReadScopeInstances (std::istream& in)
{
Severity rval = SEVERITY_NULL;
SCLP23(Application_instance) * se;
@@ -2024,7 +2024,7 @@ STEPfile::ReadScopeInstances (G4std::istream& in)
/*
Severity
STEPfile::ReadSubSuperInstance (G4std::istream& in)
STEPfile::ReadSubSuperInstance (std::istream& in)
{
SCLstring tmp;
SkipInstance(in, tmp);
@@ -2034,7 +2034,7 @@ STEPfile::ReadSubSuperInstance (G4std::istream& in)
#ifdef junk
void
ReadEntityError(char c, int i, G4std::istream& in)
ReadEntityError(char c, int i, std::istream& in)
{
char errStr[BUFSIZ];
errStr[0] = '\0';
@@ -2083,7 +2083,7 @@ ReadEntityError(char c, int i, G4std::istream& in)
}
if(in.good() && (c == ')') )
{
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
in.get(c);
tmp.Append(c);
// G4cerr << c;
@@ -2104,14 +2104,14 @@ ReadEntityError(char c, int i, G4std::istream& in)
/*****************************************************
description:
This function populates a SCLP23(Application_instance) with the values read from
the G4std::istream.
the std::istream.
This function must keeps track of error messages encountered when
reading the SCLP23(Application_instance). It passes SCLP23(Application_instance) error information onto
the STEPfile ErrorDescriptor.
*****************************************************/
SCLP23(Application_instance) *
STEPfile::ReadInstance(G4std::istream& in, G4std::ostream& out, SCLstring &cmtStr,
STEPfile::ReadInstance(std::istream& in, std::ostream& out, SCLstring &cmtStr,
int useTechCor)
{
Severity sev = SEVERITY_NULL;
@@ -2181,7 +2181,7 @@ STEPfile::ReadInstance(G4std::istream& in, G4std::ostream& out, SCLstring &cmtSt
ReadTokenSeparator(in, &cmtStr);
//peek at the next character on the G4std::istream
//peek at the next character on the std::istream
c = in.peek();
//check for optional "&SCOPE" construct
@@ -2374,7 +2374,7 @@ STEPfile::MakeBackupFile()
/***************************
***************************/
Severity
STEPfile::WriteExchangeFile(G4std::ostream& out, int validate, int clearError,
STEPfile::WriteExchangeFile(std::ostream& out, int validate, int clearError,
int writeComments)
{
Severity rval = SEVERITY_NULL;
@@ -2422,7 +2422,7 @@ STEPfile::WriteExchangeFile(const char* filename, int validate, int clearError,
}
}
G4std::ostream* out = OpenOutputFile(filename);
std::ostream* out = OpenOutputFile(filename);
if (_error.severity() < SEVERITY_WARNING) return _error.severity();
rval = WriteExchangeFile(*out, 0, 0, writeComments);
CloseOutputFile(out);
@@ -2433,7 +2433,7 @@ STEPfile::WriteExchangeFile(const char* filename, int validate, int clearError,
/***************************
***************************/
Severity
STEPfile::WriteValuePairsFile(G4std::ostream& out, int validate, int clearError,
STEPfile::WriteValuePairsFile(std::ostream& out, int validate, int clearError,
int writeComments, int mixedCase)
{
Severity rval = SEVERITY_NULL;
@@ -2521,7 +2521,7 @@ STEPfile::HeaderIdOld (const char* name)
/***************************
***************************/
void
STEPfile::WriteHeader(G4std::ostream& out)
STEPfile::WriteHeader(std::ostream& out)
{
out << "HEADER;\n";
@@ -2552,7 +2552,7 @@ STEPfile::WriteHeader(G4std::ostream& out)
/***************************
***************************/
void
STEPfile::WriteHeaderInstance(SCLP23(Application_instance)* obj, G4std::ostream& out)
STEPfile::WriteHeaderInstance(SCLP23(Application_instance)* obj, std::ostream& out)
{
SCLstring tmp;
if(obj->P21CommentRep())
@@ -2570,7 +2570,7 @@ STEPfile::WriteHeaderInstance(SCLP23(Application_instance)* obj, G4std::ostream&
/***************************
***************************/
void
STEPfile::WriteHeaderInstanceFileName (G4std::ostream& out)
STEPfile::WriteHeaderInstanceFileName (std::ostream& out)
{
// Get the FileName instance from _headerInstances
SCLP23(Application_instance) *se = 0;
@@ -2622,7 +2622,7 @@ STEPfile::WriteHeaderInstanceFileName (G4std::ostream& out)
(SCLP23(Application_instance)*)fn = _headerInstances->GetApplication_instance(mn);
}
// Write the values for the FileName instance to the G4std::ostream
// Write the values for the FileName instance to the std::ostream
SCLstring tmp;
out << StrToUpper (fn->EntityName()) << "(";
@@ -2674,7 +2674,7 @@ STEPfile::WriteHeaderInstanceFileName (G4std::ostream& out)
void
STEPfile::WriteHeaderInstanceFileDescription (G4std::ostream& out)
STEPfile::WriteHeaderInstanceFileDescription (std::ostream& out)
{
// Get the FileDescription instance from _headerInstances
SCLP23(Application_instance) *se = 0;
@@ -2704,7 +2704,7 @@ STEPfile::WriteHeaderInstanceFileDescription (G4std::ostream& out)
{
(SCLP23(Application_instance)*)fd = _headerInstances->GetApplication_instance(mn);
}
// Write the values for the FileDescription instance to the G4std::ostream
// Write the values for the FileDescription instance to the std::ostream
out << StrToUpper (fd->EntityName()) << "(";
//write description
@@ -2721,7 +2721,7 @@ STEPfile::WriteHeaderInstanceFileDescription (G4std::ostream& out)
}
void
STEPfile::WriteHeaderInstanceFileSchema (G4std::ostream& out)
STEPfile::WriteHeaderInstanceFileSchema (std::ostream& out)
{
// Get the FileName instance from _headerInstances
SCLP23(Application_instance) *se = 0;
@@ -2751,7 +2751,7 @@ STEPfile::WriteHeaderInstanceFileSchema (G4std::ostream& out)
{
(SCLP23(Application_instance)*)fs = _headerInstances->GetApplication_instance(mn);
}
// Write the values for the FileName instance to the G4std::ostream
// Write the values for the FileName instance to the std::ostream
out << StrToUpper (fs->EntityName()) << "(";
// write schema_identifiers
@@ -2766,7 +2766,7 @@ STEPfile::WriteHeaderInstanceFileSchema (G4std::ostream& out)
***************************/
void
STEPfile::WriteData(G4std::ostream& out, int writeComments)
STEPfile::WriteData(std::ostream& out, int writeComments)
{
char currSch[BUFSIZ];
currSch[0] = '\0';
@@ -2786,7 +2786,7 @@ STEPfile::WriteData(G4std::ostream& out, int writeComments)
***************************/
void
STEPfile::WriteValuePairsData(G4std::ostream& out, int writeComments, int mixedCase)
STEPfile::WriteValuePairsData(std::ostream& out, int writeComments, int mixedCase)
{
char currSch[BUFSIZ];
currSch[0] = '\0';
@@ -2803,7 +2803,7 @@ STEPfile::WriteValuePairsData(G4std::ostream& out, int writeComments, int mixedC
}
Severity
STEPfile::AppendFile (G4std::istream* in, int useTechCor)
STEPfile::AppendFile (std::istream* in, int useTechCor)
{
Severity rval = SEVERITY_NULL;
char errbuf[BUFSIZ];
@@ -2814,7 +2814,7 @@ STEPfile::AppendFile (G4std::istream* in, int useTechCor)
ReadTokenSeparator(*in);
SCLstring keywd = GetKeyword(*in, "; #", _error);
// get the delimiter off the G4std::istream
// get the delimiter off the std::istream
char c;
in->get(c);
@@ -2904,7 +2904,7 @@ STEPfile::AppendFile (G4std::istream* in, int useTechCor)
// reset the error count so you\'re not counting things twice:
_errorCount = 0;
// delete in; // yikes -- deleted by caller
G4std::istream * in2;
std::istream * in2;
if (! ((in2 = OpenInputFile ()) && (in2 -> good ())) )
{ // if the stream is not readable, there's an error
_error.AppendToUserMsg ("Cannot open file for 2nd pass -- No data read.\n");
@@ -2970,7 +2970,7 @@ STEPfile::AppendFile (G4std::istream* in, int useTechCor)
{
ReadTokenSeparator(*in2);
keywd = GetKeyword (*in2,";", _error);
//yank the ";" from the G4std::istream
//yank the ";" from the std::istream
//if (';' == in2->peek()) in2->get();
char c; in2->get(c); if (c == ';') ;
}
@@ -2993,7 +2993,7 @@ STEPfile::AppendFile (G4std::istream* in, int useTechCor)
/***************************
***************************/
Severity
STEPfile::WriteWorkingFile(G4std::ostream& out, int clearError, int writeComments)
STEPfile::WriteWorkingFile(std::ostream& out, int clearError, int writeComments)
{
SetFileType (WORKING_SESSION);
if(clearError)
@@ -3023,7 +3023,7 @@ STEPfile::WriteWorkingFile(const char* filename, int clearError,
{
if(clearError)
_error.ClearErrorMsg();
G4std::ostream* out = OpenOutputFile(filename);
std::ostream* out = OpenOutputFile(filename);
if (_error.severity() < SEVERITY_WARNING) return _error.severity();
Severity rval = WriteWorkingFile(*out, 0, writeComments);
CloseOutputFile(out);
@@ -3035,7 +3035,7 @@ STEPfile::WriteWorkingFile(const char* filename, int clearError,
/***************************
***************************/
void
STEPfile::WriteWorkingData(G4std::ostream& out, int writeComments)
STEPfile::WriteWorkingData(std::ostream& out, int writeComments)
{
char currSch[BUFSIZ];
currSch[0] = '\0';
source/geometry/solids/STEP/src/STEPfile_inline.cc
+16 -16
View File
@@ -11,7 +11,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPfile_inline.cc,v 1.7 2000/11/20 18:14:58 gcosmo Exp $ */
/* $Id: STEPfile_inline.cc,v 1.8 2003/06/06 17:07:33 gcosmo Exp $ */
#include <STEPfile.h>
#include <s_HEADER_SCHEMA.h>
@@ -129,7 +129,7 @@ STEPfile::ReadExchangeFile(const char* filename, int useTechCor)
{
_error.ClearErrorMsg();
_errorCount = 0;
G4std::istream* in = OpenInputFile(filename);
std::istream* in = OpenInputFile(filename);
if (_error.severity() < SEVERITY_WARNING)
{
CloseInputFile(in);
@@ -150,7 +150,7 @@ STEPfile::AppendExchangeFile (const char* filename, int useTechCor)
{
_error.ClearErrorMsg();
_errorCount = 0;
G4std::istream* in = OpenInputFile(filename);
std::istream* in = OpenInputFile(filename);
if (_error.severity() < SEVERITY_WARNING)
{
CloseInputFile(in);
@@ -167,7 +167,7 @@ STEPfile::ReadWorkingFile(const char* filename, int useTechCor)
{
_error.ClearErrorMsg();
_errorCount = 0;
G4std::istream* in = OpenInputFile(filename);
std::istream* in = OpenInputFile(filename);
if (_error.severity() < SEVERITY_WARNING)
{
CloseInputFile(in);
@@ -190,7 +190,7 @@ STEPfile::AppendWorkingFile(const char* filename, int useTechCor)
{
_error.ClearErrorMsg();
_errorCount = 0;
G4std::istream* in = OpenInputFile(filename);
std::istream* in = OpenInputFile(filename);
if (_error.severity() < SEVERITY_WARNING)
{
CloseInputFile(in);
@@ -206,7 +206,7 @@ STEPfile::AppendWorkingFile(const char* filename, int useTechCor)
/******************************************************/
G4std::istream*
std::istream*
STEPfile::OpenInputFile (const char* filename)
{
// if there's no filename to use, fail
@@ -226,10 +226,10 @@ STEPfile::OpenInputFile (const char* filename)
return (0);
}
}
// G4std::istream* in = new G4std::istream(FileName(), io_readonly, a_useonly);
// std::istream* in = new std::istream(FileName(), io_readonly, a_useonly);
// port 29-Mar-1994 kcm
G4std::istream* in = new G4std::ifstream(FileName());
// default for G4std::ostream is readonly and protections are set to 644
std::istream* in = new std::ifstream(FileName());
// default for std::ostream is readonly and protections are set to 644
// if ( !in || !(in -> readable ()) )
if ( !in || !(in -> good ()) )
{
@@ -244,7 +244,7 @@ STEPfile::OpenInputFile (const char* filename)
/******************************************************/
void
STEPfile::CloseInputFile(G4std::istream* in)
STEPfile::CloseInputFile(std::istream* in)
{
delete in;
}
@@ -254,7 +254,7 @@ STEPfile::CloseInputFile(G4std::istream* in)
/*
void
STEPfile::ReadWhiteSpace (G4std::istream& in)
STEPfile::ReadWhiteSpace (std::istream& in)
{
char c = ' ';
@@ -267,7 +267,7 @@ STEPfile::ReadWhiteSpace (G4std::istream& in)
/***************************
***************************/
G4std::ofstream*
std::ofstream*
STEPfile::OpenOutputFile(const char* filename)
{
if (!filename)
@@ -291,10 +291,10 @@ STEPfile::OpenOutputFile(const char* filename)
if (_currentDir->FileExists(TruncFileName(FileName())))
MakeBackupFile();
// G4std::ostream* out = new G4std::ostream(FileName(), io_writeonly, a_create);
// std::ostream* out = new std::ostream(FileName(), io_writeonly, a_create);
// - port 29-Mar-1994 kcm
G4std::ofstream* out = new G4std::ofstream(FileName());
// default for G4std::ostream is writeonly and protections are set to 644
std::ofstream* out = new std::ofstream(FileName());
// default for std::ostream is writeonly and protections are set to 644
if (!out)
{
_error.AppendToUserMsg("unable to open file for output\n");
@@ -304,7 +304,7 @@ STEPfile::OpenOutputFile(const char* filename)
}
void
STEPfile::CloseOutputFile(G4std::ostream* out)
STEPfile::CloseOutputFile(std::ostream* out)
{
delete out;
}
source/geometry/solids/STEP/src/STEPundefined.cc
+9 -9
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPundefined.cc,v 1.4 2000/01/21 13:42:58 gcosmo Exp $ */
/* $Id: STEPundefined.cc,v 1.5 2003/06/06 17:07:33 gcosmo Exp $ */
#include <stdio.h> // to get the BUFSIZ #define
#include <STEPundefined.h>
@@ -30,7 +30,7 @@ SCLundefined::StrToVal(const char *s, ErrorDescriptor *err)
}
Severity
SCLundefined::StrToVal(G4std::istream &in, ErrorDescriptor *err)
SCLundefined::StrToVal(std::istream &in, ErrorDescriptor *err)
{
return STEPread(in, err);
}
@@ -38,20 +38,20 @@ SCLundefined::StrToVal(G4std::istream &in, ErrorDescriptor *err)
Severity
SCLundefined::STEPread(const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *) s);
std::istrstream in((char *) s);
return STEPread(in, err);
}
Severity
SCLundefined::STEPread(G4std::istream &in, ErrorDescriptor *err)
SCLundefined::STEPread(std::istream &in, ErrorDescriptor *err)
{
char c = '\0';
G4std::strstream ss;
std::strstream ss;
SCLstring str;
int terminal = 0;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
in >> c;
if(c == '$')
{
@@ -108,7 +108,7 @@ SCLundefined::STEPread(G4std::istream &in, ErrorDescriptor *err)
// if (!in.readable ()) terminal =1;
}
ss << G4std::ends;
ss << std::ends;
val = ss.str();
err->GreaterSeverity(SEVERITY_NULL);
@@ -135,7 +135,7 @@ SCLundefined::STEPwrite(SCLstring &s)
}
void
SCLundefined:: STEPwrite (G4std::ostream& out)
SCLundefined:: STEPwrite (std::ostream& out)
{
if(val.rep())
out << val.chars();
@@ -186,7 +186,7 @@ SCLundefined::is_null ()
/*
int
SCLundefined::STEPread(G4std::istream& in )
SCLundefined::STEPread(std::istream& in )
{
char c ='\0';
char buf [BUFSIZ];
source/geometry/solids/STEP/src/SdaiAll.cc
+9 -9
View File
@@ -3,7 +3,7 @@
// This file was generated by fedex_plus. You probably don't want to edit
// it since your modifications will be lost if fedex_plus is used to
// regenerate it.
/* $Id: SdaiAll.cc,v 1.3 2000/11/20 18:14:59 gcosmo Exp $ */
/* $Id: SdaiAll.cc,v 1.4 2003/06/06 17:07:33 gcosmo Exp $ */
#include <schema.h>
#ifdef WIN32
@@ -4846,21 +4846,21 @@ END_FUNCTION; -- acyclic_curve_replica
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr2: (SIZEOF\n\t(QUERY \n\t( it <* SELF\\representation.items | \n\t(SIZEOF\n\t([ 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL', 'CONFIG_CONTROL_DESIGN.MAPPED_ITEM'] * TYPEOF\n\t(it)) = 1) )) >= 1);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr3: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_CURVE' IN TYPEOF\n\t(el.edge_element))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr3: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_CURVE' IN TYPEOF\n\t(el.edge_element))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr4: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( pline_el <* QUERY \n\t( el <* eloop\\path.edge_list | \n\t( 'CONFIG_CONTROL_DESIGN.POLYLINE' IN TYPEOF\n\t(el.edge_element\\ edge_curve.edge_geometry)) ) | \n\t(NOT \n\t(SIZEOF\n\t(pline_el.edge_element\\ edge_curve.edge_geometry\\polyline.points) > 2)) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr4: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( pline_el <* QUERY \n\t( el <* eloop\\path.edge_list | \n\t( 'CONFIG_CONTROL_DESIGN.POLYLINE' IN TYPEOF\n\t(el.edge_element\\ edge_curve.edge_geometry)) ) | \n\t(NOT \n\t(SIZEOF\n\t(pline_el.edge_element\\ edge_curve.edge_geometry\\polyline.points) > 2)) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr5: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT valid_wireframe_edge_curve\n\t(el.edge_element\\edge_curve.edge_geometry, 'CONFIG_CONTROL_DESIGN')) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr5: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT valid_wireframe_edge_curve\n\t(el.edge_element\\edge_curve.edge_geometry, 'CONFIG_CONTROL_DESIGN')) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr6: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t(\n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(el.edge_element. edge_start)) AND \n\t('CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(el .edge_element.edge_end)))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr6: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t(\n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(el.edge_element. edge_start)) AND \n\t('CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(el .edge_element.edge_end)))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr7: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t( valid_wireframe_vertex_point\n\t(el.edge_element.edge_start\\ vertex_point.vertex_geometry,'CONFIG_CONTROL_DESIGN') AND valid_wireframe_vertex_point\n\t(el.edge_element.edge_end\\vertex_point. vertex_geometry,'CONFIG_CONTROL_DESIGN'))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr7: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( el <* eloop\\path.edge_list | \n\t(NOT \n\t( valid_wireframe_vertex_point\n\t(el.edge_element.edge_start\\ vertex_point.vertex_geometry,'CONFIG_CONTROL_DESIGN') AND valid_wireframe_vertex_point\n\t(el.edge_element.edge_end\\vertex_point. vertex_geometry,'CONFIG_CONTROL_DESIGN'))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr8: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( con_edges <* QUERY \n\t( el <* eloop\\path.edge_list | \n\t( 'CONFIG_CONTROL_DESIGN.CONIC' IN TYPEOF\n\t(el.edge_element\\edge_curve. edge_geometry)) ) | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.AXIS2_PLACEMENT_3D' IN TYPEOF\n\t(con_edges. edge_element\\edge_curve.edge_geometry\\conic.position))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr8: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( eloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.EDGE_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( con_edges <* QUERY \n\t( el <* eloop\\path.edge_list | \n\t( 'CONFIG_CONTROL_DESIGN.CONIC' IN TYPEOF\n\t(el.edge_element\\edge_curve. edge_geometry)) ) | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.AXIS2_PLACEMENT_3D' IN TYPEOF\n\t(con_edges. edge_element\\edge_curve.edge_geometry\\conic.position))) )) = 0)) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr9: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( vloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(vloop.loop_vertex))) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr9: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( vloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(vloop.loop_vertex))) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr10: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( G4std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( vloop <* QUERY \n\t( wsb <* G4std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT valid_wireframe_vertex_point\n\t(vloop\\vertex_loop.loop_vertex\\ vertex_point.vertex_geometry,'CONFIG_CONTROL_DESIGN')) )) = 0)) )) = 0)) )) = 0);\n");
wr = new Where_rule("wr10: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( std::ws <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.WIRE_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t(SIZEOF\n\t( QUERY \n\t( vloop <* QUERY \n\t( wsb <* std::ws\\wire_shell.wire_shell_extent | \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_LOOP' IN TYPEOF\n\t(wsb)) ) | \n\t(NOT valid_wireframe_vertex_point\n\t(vloop\\vertex_loop.loop_vertex\\ vertex_point.vertex_geometry,'CONFIG_CONTROL_DESIGN')) )) = 0)) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
wr = new Where_rule("wr11: (SIZEOF\n\t(QUERY \n\t( sbwm <* QUERY \n\t( it <* SELF\\representation.items | \n\t( 'CONFIG_CONTROL_DESIGN.SHELL_BASED_WIREFRAME_MODEL' IN TYPEOF\n\t(it)) ) | \n\t(NOT \n\t(SIZEOF\n\t(QUERY \n\t( vs <* QUERY \n\t( sb <* sbwm\\ shell_based_wireframe_model.sbwm_boundary | \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_SHELL' IN TYPEOF\n\t(sb)) ) | \n\t(NOT \n\t( 'CONFIG_CONTROL_DESIGN.VERTEX_POINT' IN TYPEOF\n\t(vs\\vertex_shell. vertex_shell_extent.loop_vertex))) )) = 0)) )) = 0);\n");
config_control_designe_shell_based_wireframe_shape_representation->_where_rules->Append(wr);
source/geometry/solids/STEP/src/SdaiBinary.cc
+13 -13
View File
@@ -11,11 +11,11 @@
/* $Id: sdaiBinary.cc,v */
#include "g4std/strstream"
#include <sdai.h>
#include <strstream>
extern Severity
CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err,
CheckRemainingInput(std::istream &in, ErrorDescriptor *err,
const char *typeName, // used in error message
const char *tokenList); // e.g. ",)"
@@ -28,7 +28,7 @@ SCLP23(Binary)::operator= (const char* s)
}
void
SCLP23(Binary)::STEPwrite (G4std::ostream& out) const
SCLP23(Binary)::STEPwrite (std::ostream& out) const
{
const char *str = 0;
if (is_null ())
@@ -70,7 +70,7 @@ SCLP23(Binary)::STEPwrite (SCLstring &s) const
}
Severity
SCLP23(Binary)::ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
SCLP23(Binary)::ReadBinary(std::istream& in, ErrorDescriptor *err, int AssignVal,
int needDelims)
{
if(AssignVal)
@@ -83,7 +83,7 @@ SCLP23(Binary)::ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignV
int validDelimiters = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
if( in.good() )
{
@@ -164,7 +164,7 @@ SCLP23(Binary)::ReadBinary(G4std::istream& in, ErrorDescriptor *err, int AssignV
Severity
SCLP23(Binary)::StrToVal (const char * s, ErrorDescriptor *err)
{
G4std::istrstream in ((char *)s); // sz defaults to length of s
std::istrstream in ((char *)s); // sz defaults to length of s
return ReadBinary(in, err, 1, 0);
}
@@ -255,19 +255,19 @@ SCLP23(Binary)::StrToVal (const char * s, ErrorDescriptor *err)
// delimited by double quotes
Severity
SCLP23(Binary)::STEPread (G4std::istream& in, ErrorDescriptor *err)
SCLP23(Binary)::STEPread (std::istream& in, ErrorDescriptor *err)
{
return ReadBinary(in, err, 1, 1);
/*
int foundEndQuote = 0; // need so this string is not ok: 'hi''
set_null (); // clear the old string
char c;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
in >> c;
// remember the current format state to restore the previous settings
long int flags = in.flags();
in.unsetf(G4std::ios::skipws);
in.unsetf(std::ios::skipws);
if (c == BINARY_DELIM)
{
@@ -298,7 +298,7 @@ SCLP23(Binary)::STEPread (G4std::istream& in, ErrorDescriptor *err)
Severity
SCLP23(Binary)::STEPread (const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return STEPread (in, err);
}
@@ -323,14 +323,14 @@ SCLP23(Binary)::STEPread (const char *s, ErrorDescriptor *err)
///////////////////////////////////////////////////////////////////////////////
Severity
SCLP23(Binary)::BinaryValidLevel (G4std::istream &in, ErrorDescriptor *err,
SCLP23(Binary)::BinaryValidLevel (std::istream &in, ErrorDescriptor *err,
int optional, char *tokenList,
int needDelims, int clearError)
{
if(clearError)
err->ClearErrorMsg();
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
char c = in.peek();
if(c == '$' || in.eof())
{
@@ -365,7 +365,7 @@ SCLP23(Binary)::BinaryValidLevel (const char *value, ErrorDescriptor *err,
int optional, char *tokenList,
int needDelims, int clearError)
{
G4std::istrstream in((char *)value);
std::istrstream in((char *)value);
return BinaryValidLevel (in, err, optional, tokenList,
needDelims, clearError);
}
source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc
+96 -96
View File
@@ -3,14 +3,14 @@
// This file was generated by fedex_plus. You probably don't want to edit
// it since your modifications will be lost if fedex_plus is used to
// regenerate it.
/* $Id: SdaiCONFIG_CONTROL_DESIGN.cc,v 1.7 2001/09/19 11:22:32 gcosmo Exp $ */
/* $Id: SdaiCONFIG_CONTROL_DESIGN.cc,v 1.8 2003/06/06 17:07:33 gcosmo Exp $ */
#ifndef SCHEMA_H
#include <schema.h>
#endif
#ifdef SCL_LOGGING
#include "g4std/fstream"
extern G4std::ofstream *logStream;
#include <fstream>
extern std::ofstream *logStream;
#define SCLLOGFILE "scl.log"
#endif
@@ -1440,7 +1440,7 @@ SdaiCharacterized_product_definition::NewSelect ()
// STEP Part 21
void
SdaiCharacterized_product_definition::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiCharacterized_product_definition::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition)
_app_inst -> STEPwrite_reference (out);
@@ -1468,7 +1468,7 @@ SdaiCharacterized_product_definition::ValueType() const
}
void
SdaiCharacterized_product_definition::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiCharacterized_product_definition::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -1498,7 +1498,7 @@ SdaiCharacterized_product_definition::STEPwrite_verbose (G4std::ostream& out, co
}
Severity
SdaiCharacterized_product_definition::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiCharacterized_product_definition::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition) {
@@ -2054,7 +2054,7 @@ SdaiShape_definition::NewSelect ()
// STEP Part 21
void
SdaiShape_definition::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiShape_definition::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_shape)
_app_inst -> STEPwrite_reference (out);
@@ -2086,7 +2086,7 @@ SdaiShape_definition::ValueType() const
}
void
SdaiShape_definition::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiShape_definition::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -2122,7 +2122,7 @@ SdaiShape_definition::STEPwrite_verbose (G4std::ostream& out, const char *currSc
}
Severity
SdaiShape_definition::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiShape_definition::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_shape) {
@@ -2753,7 +2753,7 @@ SdaiCharacterized_definition::NewSelect ()
// STEP Part 21
void
SdaiCharacterized_definition::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiCharacterized_definition::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designt_characterized_product_definition)
_sdaicharacterized_product_definition.STEPwrite (out, currSch);
@@ -2781,7 +2781,7 @@ SdaiCharacterized_definition::ValueType() const
}
void
SdaiCharacterized_definition::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiCharacterized_definition::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -2811,7 +2811,7 @@ SdaiCharacterized_definition::STEPwrite_verbose (G4std::ostream& out, const char
}
Severity
SdaiCharacterized_definition::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiCharacterized_definition::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designt_characterized_product_definition) {
@@ -3137,7 +3137,7 @@ SdaiChange_request_item::NewSelect ()
// STEP Part 21
void
SdaiChange_request_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiChange_request_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -3161,7 +3161,7 @@ SdaiChange_request_item::ValueType() const
}
void
SdaiChange_request_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiChange_request_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -3185,7 +3185,7 @@ SdaiChange_request_item::STEPwrite_verbose (G4std::ostream& out, const char *cur
}
Severity
SdaiChange_request_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiChange_request_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -3566,7 +3566,7 @@ SdaiReversible_topology_item::NewSelect ()
// STEP Part 21
void
SdaiReversible_topology_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiReversible_topology_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_edge)
_app_inst -> STEPwrite_reference (out);
@@ -3610,7 +3610,7 @@ SdaiReversible_topology_item::ValueType() const
}
void
SdaiReversible_topology_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiReversible_topology_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -3664,7 +3664,7 @@ SdaiReversible_topology_item::STEPwrite_verbose (G4std::ostream& out, const char
}
Severity
SdaiReversible_topology_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiReversible_topology_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_edge) {
@@ -4534,7 +4534,7 @@ SdaiAxis2_placement::NewSelect ()
// STEP Part 21
void
SdaiAxis2_placement::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiAxis2_placement::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_axis2_placement_2d)
_app_inst -> STEPwrite_reference (out);
@@ -4562,7 +4562,7 @@ SdaiAxis2_placement::ValueType() const
}
void
SdaiAxis2_placement::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiAxis2_placement::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -4592,7 +4592,7 @@ SdaiAxis2_placement::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiAxis2_placement::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiAxis2_placement::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_axis2_placement_2d) {
@@ -5066,7 +5066,7 @@ SdaiSpecified_item::NewSelect ()
// STEP Part 21
void
SdaiSpecified_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiSpecified_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition)
_app_inst -> STEPwrite_reference (out);
@@ -5094,7 +5094,7 @@ SdaiSpecified_item::ValueType() const
}
void
SdaiSpecified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiSpecified_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -5124,7 +5124,7 @@ SdaiSpecified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiSpecified_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiSpecified_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition) {
@@ -5654,7 +5654,7 @@ SdaiMeasure_value::NewSelect ()
// STEP Part 21
void
SdaiMeasure_value::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiMeasure_value::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designt_area_measure)
WriteReal(_real,out);
@@ -5722,7 +5722,7 @@ SdaiMeasure_value::ValueType() const
}
void
SdaiMeasure_value::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiMeasure_value::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -5812,7 +5812,7 @@ SdaiMeasure_value::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiMeasure_value::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiMeasure_value::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designt_area_measure) {
@@ -6332,7 +6332,7 @@ SdaiPerson_organization_select::NewSelect ()
// STEP Part 21
void
SdaiPerson_organization_select::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiPerson_organization_select::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_person_and_organization)
_app_inst -> STEPwrite_reference (out);
@@ -6356,7 +6356,7 @@ SdaiPerson_organization_select::ValueType() const
}
void
SdaiPerson_organization_select::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiPerson_organization_select::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -6380,7 +6380,7 @@ SdaiPerson_organization_select::STEPwrite_verbose (G4std::ostream& out, const ch
}
Severity
SdaiPerson_organization_select::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiPerson_organization_select::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_person_and_organization) {
@@ -6709,7 +6709,7 @@ SdaiPcurve_or_surface::NewSelect ()
// STEP Part 21
void
SdaiPcurve_or_surface::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiPcurve_or_surface::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_pcurve)
_app_inst -> STEPwrite_reference (out);
@@ -6737,7 +6737,7 @@ SdaiPcurve_or_surface::ValueType() const
}
void
SdaiPcurve_or_surface::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiPcurve_or_surface::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -6767,7 +6767,7 @@ SdaiPcurve_or_surface::STEPwrite_verbose (G4std::ostream& out, const char *currS
}
Severity
SdaiPcurve_or_surface::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiPcurve_or_surface::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_pcurve) {
@@ -7197,7 +7197,7 @@ SdaiClassified_item::NewSelect ()
// STEP Part 21
void
SdaiClassified_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiClassified_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -7225,7 +7225,7 @@ SdaiClassified_item::ValueType() const
}
void
SdaiClassified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiClassified_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -7255,7 +7255,7 @@ SdaiClassified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiClassified_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiClassified_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -7805,7 +7805,7 @@ SdaiVector_or_direction::NewSelect ()
// STEP Part 21
void
SdaiVector_or_direction::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiVector_or_direction::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_vector)
_app_inst -> STEPwrite_reference (out);
@@ -7833,7 +7833,7 @@ SdaiVector_or_direction::ValueType() const
}
void
SdaiVector_or_direction::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiVector_or_direction::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -7863,7 +7863,7 @@ SdaiVector_or_direction::STEPwrite_verbose (G4std::ostream& out, const char *cur
}
Severity
SdaiVector_or_direction::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiVector_or_direction::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_vector) {
@@ -8321,7 +8321,7 @@ SdaiWireframe_model::NewSelect ()
// STEP Part 21
void
SdaiWireframe_model::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiWireframe_model::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_shell_based_wireframe_model)
_app_inst -> STEPwrite_reference (out);
@@ -8349,7 +8349,7 @@ SdaiWireframe_model::ValueType() const
}
void
SdaiWireframe_model::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiWireframe_model::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -8379,7 +8379,7 @@ SdaiWireframe_model::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiWireframe_model::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiWireframe_model::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_shell_based_wireframe_model) {
@@ -8815,7 +8815,7 @@ SdaiGeometric_set_select::NewSelect ()
// STEP Part 21
void
SdaiGeometric_set_select::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiGeometric_set_select::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_point)
_app_inst -> STEPwrite_reference (out);
@@ -8847,7 +8847,7 @@ SdaiGeometric_set_select::ValueType() const
}
void
SdaiGeometric_set_select::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiGeometric_set_select::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -8883,7 +8883,7 @@ SdaiGeometric_set_select::STEPwrite_verbose (G4std::ostream& out, const char *cu
}
Severity
SdaiGeometric_set_select::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiGeometric_set_select::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_point) {
@@ -9324,7 +9324,7 @@ SdaiStart_request_item::NewSelect ()
// STEP Part 21
void
SdaiStart_request_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiStart_request_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -9348,7 +9348,7 @@ SdaiStart_request_item::ValueType() const
}
void
SdaiStart_request_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiStart_request_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -9372,7 +9372,7 @@ SdaiStart_request_item::STEPwrite_verbose (G4std::ostream& out, const char *curr
}
Severity
SdaiStart_request_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiStart_request_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -9777,7 +9777,7 @@ SdaiPerson_organization_item::NewSelect ()
// STEP Part 21
void
SdaiPerson_organization_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiPerson_organization_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_change)
_app_inst -> STEPwrite_reference (out);
@@ -9837,7 +9837,7 @@ SdaiPerson_organization_item::ValueType() const
}
void
SdaiPerson_organization_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiPerson_organization_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -9915,7 +9915,7 @@ SdaiPerson_organization_item::STEPwrite_verbose (G4std::ostream& out, const char
}
Severity
SdaiPerson_organization_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiPerson_organization_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_change) {
@@ -11300,7 +11300,7 @@ SdaiDate_time_item::NewSelect ()
// STEP Part 21
void
SdaiDate_time_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiDate_time_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition)
_app_inst -> STEPwrite_reference (out);
@@ -11356,7 +11356,7 @@ SdaiDate_time_item::ValueType() const
}
void
SdaiDate_time_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiDate_time_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -11428,7 +11428,7 @@ SdaiDate_time_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiDate_time_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiDate_time_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition) {
@@ -12685,7 +12685,7 @@ SdaiShell::NewSelect ()
// STEP Part 21
void
SdaiShell::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiShell::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_open_shell)
_app_inst -> STEPwrite_reference (out);
@@ -12721,7 +12721,7 @@ SdaiShell::ValueType() const
}
void
SdaiShell::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiShell::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -12763,7 +12763,7 @@ SdaiShell::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
}
Severity
SdaiShell::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiShell::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_open_shell) {
@@ -13375,7 +13375,7 @@ SdaiTransformation::NewSelect ()
// STEP Part 21
void
SdaiTransformation::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiTransformation::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_item_defined_transformation)
_app_inst -> STEPwrite_reference (out);
@@ -13403,7 +13403,7 @@ SdaiTransformation::ValueType() const
}
void
SdaiTransformation::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiTransformation::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -13433,7 +13433,7 @@ SdaiTransformation::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiTransformation::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiTransformation::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_item_defined_transformation) {
@@ -13893,7 +13893,7 @@ SdaiBoolean_operand::NewSelect ()
// STEP Part 21
void
SdaiBoolean_operand::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiBoolean_operand::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_solid_model)
_app_inst -> STEPwrite_reference (out);
@@ -13917,7 +13917,7 @@ SdaiBoolean_operand::ValueType() const
}
void
SdaiBoolean_operand::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiBoolean_operand::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -13941,7 +13941,7 @@ SdaiBoolean_operand::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiBoolean_operand::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiBoolean_operand::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_solid_model) {
@@ -14236,7 +14236,7 @@ SdaiCertified_item::NewSelect ()
// STEP Part 21
void
SdaiCertified_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiCertified_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_supplied_part_relationship)
_app_inst -> STEPwrite_reference (out);
@@ -14260,7 +14260,7 @@ SdaiCertified_item::ValueType() const
}
void
SdaiCertified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiCertified_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -14284,7 +14284,7 @@ SdaiCertified_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiCertified_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiCertified_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_supplied_part_relationship) {
@@ -14691,7 +14691,7 @@ SdaiDate_time_select::NewSelect ()
// STEP Part 21
void
SdaiDate_time_select::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiDate_time_select::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_date_and_time)
_app_inst -> STEPwrite_reference (out);
@@ -14715,7 +14715,7 @@ SdaiDate_time_select::ValueType() const
}
void
SdaiDate_time_select::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiDate_time_select::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -14739,7 +14739,7 @@ SdaiDate_time_select::STEPwrite_verbose (G4std::ostream& out, const char *currSc
}
Severity
SdaiDate_time_select::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiDate_time_select::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_date_and_time) {
@@ -15074,7 +15074,7 @@ SdaiCurve_on_surface::NewSelect ()
// STEP Part 21
void
SdaiCurve_on_surface::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiCurve_on_surface::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_pcurve)
_app_inst -> STEPwrite_reference (out);
@@ -15106,7 +15106,7 @@ SdaiCurve_on_surface::ValueType() const
}
void
SdaiCurve_on_surface::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiCurve_on_surface::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -15142,7 +15142,7 @@ SdaiCurve_on_surface::STEPwrite_verbose (G4std::ostream& out, const char *currSc
}
Severity
SdaiCurve_on_surface::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiCurve_on_surface::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_pcurve) {
@@ -15783,7 +15783,7 @@ SdaiTrimming_select::NewSelect ()
// STEP Part 21
void
SdaiTrimming_select::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiTrimming_select::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_cartesian_point)
_app_inst -> STEPwrite_reference (out);
@@ -15811,7 +15811,7 @@ SdaiTrimming_select::ValueType() const
}
void
SdaiTrimming_select::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiTrimming_select::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -15841,7 +15841,7 @@ SdaiTrimming_select::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiTrimming_select::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiTrimming_select::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_cartesian_point) {
@@ -16223,7 +16223,7 @@ SdaiContracted_item::NewSelect ()
// STEP Part 21
void
SdaiContracted_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiContracted_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -16247,7 +16247,7 @@ SdaiContracted_item::ValueType() const
}
void
SdaiContracted_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiContracted_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -16271,7 +16271,7 @@ SdaiContracted_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch
}
Severity
SdaiContracted_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiContracted_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -16622,7 +16622,7 @@ SdaiUnit::NewSelect ()
// STEP Part 21
void
SdaiUnit::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiUnit::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_named_unit)
_app_inst -> STEPwrite_reference (out);
@@ -16646,7 +16646,7 @@ SdaiUnit::ValueType() const
}
void
SdaiUnit::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiUnit::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -16670,7 +16670,7 @@ SdaiUnit::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
}
Severity
SdaiUnit::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiUnit::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_named_unit) {
@@ -16965,7 +16965,7 @@ SdaiReversible_topology::NewSelect ()
// STEP Part 21
void
SdaiReversible_topology::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiReversible_topology::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designt_reversible_topology_item)
_sdaireversible_topology_item.STEPwrite (out, currSch);
@@ -16997,7 +16997,7 @@ SdaiReversible_topology::ValueType() const
}
void
SdaiReversible_topology::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiReversible_topology::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -17033,7 +17033,7 @@ SdaiReversible_topology::STEPwrite_verbose (G4std::ostream& out, const char *cur
}
Severity
SdaiReversible_topology::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiReversible_topology::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designt_reversible_topology_item) {
@@ -17395,7 +17395,7 @@ SdaiWork_item::NewSelect ()
// STEP Part 21
void
SdaiWork_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiWork_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -17419,7 +17419,7 @@ SdaiWork_item::ValueType() const
}
void
SdaiWork_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiWork_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -17443,7 +17443,7 @@ SdaiWork_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) cons
}
Severity
SdaiWork_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiWork_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -17806,7 +17806,7 @@ SdaiSupported_item::NewSelect ()
// STEP Part 21
void
SdaiSupported_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiSupported_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_action_directive)
_app_inst -> STEPwrite_reference (out);
@@ -17838,7 +17838,7 @@ SdaiSupported_item::ValueType() const
}
void
SdaiSupported_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiSupported_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -17874,7 +17874,7 @@ SdaiSupported_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiSupported_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiSupported_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_action_directive) {
@@ -18587,7 +18587,7 @@ SdaiApproved_item::NewSelect ()
// STEP Part 21
void
SdaiApproved_item::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiApproved_item::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation)
_app_inst -> STEPwrite_reference (out);
@@ -18651,7 +18651,7 @@ SdaiApproved_item::ValueType() const
}
void
SdaiApproved_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiApproved_item::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -18735,7 +18735,7 @@ SdaiApproved_item::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiApproved_item::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiApproved_item::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) {
@@ -20188,7 +20188,7 @@ SdaiSurface_model::NewSelect ()
// STEP Part 21
void
SdaiSurface_model::STEPwrite_content (G4std::ostream& out, const char * currSch) const
SdaiSurface_model::STEPwrite_content (std::ostream& out, const char * currSch) const
{
if (CurrentUnderlyingType () == config_control_designe_shell_based_surface_model)
_app_inst -> STEPwrite_reference (out);
@@ -20212,7 +20212,7 @@ SdaiSurface_model::ValueType() const
}
void
SdaiSurface_model::STEPwrite_verbose (G4std::ostream& out, const char *currSch) const
SdaiSurface_model::STEPwrite_verbose (std::ostream& out, const char *currSch) const
{
const TypeDescriptor *td = CurrentUnderlyingType();
SCLstring tmp;
@@ -20236,7 +20236,7 @@ SdaiSurface_model::STEPwrite_verbose (G4std::ostream& out, const char *currSch)
}
Severity
SdaiSurface_model::STEPread_content (G4std::istream& in, InstMgr * instances,
SdaiSurface_model::STEPread_content (std::istream& in, InstMgr * instances,
const char *utype, int addFileId, const char *currSch)
{
if (CurrentUnderlyingType () == config_control_designe_shell_based_surface_model) {
source/geometry/solids/STEP/src/Str.cc
+6 -6
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: Str.cc,v 1.4 2000/01/21 13:43:06 gcosmo Exp $ */
/* $Id: Str.cc,v 1.5 2003/06/06 17:07:35 gcosmo Exp $ */
#include <Str.h>
@@ -175,8 +175,8 @@ StrCmpIns( const char *strA, const char *strB )
// this function can push the file pointer up to but not past the delimiter
// (i.e. not removing the delimiter from the input stream). If you have a
// string containing a single value and you expect the whole string to contain
// a valid value, you can change the string to an G4std::istrstream, read the value
// then send the G4std::istrstream to this function with tokenList set to null
// a valid value, you can change the string to an std::istrstream, read the value
// then send the std::istrstream to this function with tokenList set to null
// and this function will set an error for you if any input remains following
// the value.
@@ -199,7 +199,7 @@ StrCmpIns( const char *strA, const char *strB )
// no way to know when to stop.
Severity
CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err,
CheckRemainingInput(std::istream &in, ErrorDescriptor *err,
const char *typeName, // used in error message
const char *tokenList) // e.g. ",)"
{
@@ -216,7 +216,7 @@ CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err,
// preceding a delimiter if you are expecting one.
in.clear(); // clear the istreams error
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
if(in.eof()) // no input following the desired input (or following the
{ // missing desired input)
return err->severity();
@@ -299,7 +299,7 @@ CheckRemainingInput(G4std::istream &in, ErrorDescriptor *err,
return err->severity();
}
else
{ // badbit set (in.bad()) means there was a problem when reading G4std::istream
{ // badbit set (in.bad()) means there was a problem when reading std::istream
// this is bad news... it means the input stream is hopelessly messed up
err->GreaterSeverity(SEVERITY_INPUT_ERROR);
sprintf(name, "Invalid %s value.\n", typeName);
source/geometry/solids/STEP/src/errordesc.cc
+3 -3
View File
@@ -10,16 +10,16 @@
* and is not subject to copyright.
*/
/* $Id: errordesc.cc,v 1.4 2000/01/21 13:43:10 gcosmo Exp $ */
/* $Id: errordesc.cc,v 1.5 2003/06/06 17:07:35 gcosmo Exp $ */
#include <errordesc.h>
#include <Str.h>
DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF;
G4std::ostream * ErrorDescriptor::_out = 0;
std::ostream * ErrorDescriptor::_out = 0;
void
ErrorDescriptor::PrintContents(G4std::ostream &out) const
ErrorDescriptor::PrintContents(std::ostream &out) const
{
SCLstring s;
out << "Severity: " << severity(s) << G4endl;
source/geometry/solids/STEP/src/instmgr.cc
+3 -3
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: instmgr.cc,v 1.5 2000/01/21 13:43:12 gcosmo Exp $ */
/* $Id: instmgr.cc,v 1.6 2003/06/06 17:07:35 gcosmo Exp $ */
//////////////////////////////////////////////////////////////////////////////
//
@@ -253,8 +253,8 @@ MgrNode *InstMgr::Append(SCLP23(Application_instance) *se, stateEnum listState)
#ifdef __OSTORE__
mn = new (os_segment::of(this), MgrNode::get_os_typespec())
MgrNode(se, listState);
G4cout << "Appended entity: " << G4std::flush;
G4cout << se->EntityName() << G4endl << G4std::flush;
G4cout << "Appended entity: " << std::flush;
G4cout << se->EntityName() << G4endl << std::flush;
#else
*/
mn = new MgrNode(se, listState);
source/geometry/solids/STEP/src/print.cc
+4 -4
View File
@@ -12,7 +12,7 @@
// Local function prototypes:
static char *joinText( JoinType, char * );
G4std::ostream & operator << ( G4std::ostream &os, ComplexList &clist )
std::ostream & operator << ( std::ostream &os, ComplexList &clist )
/*
* Prints out a ComplexList, by iterating through its children.
*/
@@ -25,7 +25,7 @@ G4std::ostream & operator << ( G4std::ostream &os, ComplexList &clist )
return os;
}
G4std::ostream & operator << ( G4std::ostream &os, EntList &list )
std::ostream & operator << ( std::ostream &os, EntList &list )
/*
* Prints out an EntList. Calls appropriate function based on JoinType.
*/
@@ -38,7 +38,7 @@ G4std::ostream & operator << ( G4std::ostream &os, EntList &list )
return os;
}
G4std::ostream & operator << ( G4std::ostream &os, SimpleList &slist )
std::ostream & operator << ( std::ostream &os, SimpleList &slist )
/*
* Prints out a SimpleList.
*/
@@ -47,7 +47,7 @@ G4std::ostream & operator << ( G4std::ostream &os, SimpleList &slist )
return os;
}
G4std::ostream & operator << ( G4std::ostream &os, MultList &mlist )
std::ostream & operator << ( std::ostream &os, MultList &mlist )
/*
* Prints out a MultList.
*/
source/geometry/solids/STEP/src/read_func.cc
+55 -55
View File
@@ -39,20 +39,20 @@ PrintErrorState(ErrorDescriptor &err)
G4cout << err.DetailMsg() << "\n";
}
// print G4std::istream error information for debugging purposes
void IStreamState(G4std::istream &in)
// print std::istream error information for debugging purposes
void IStreamState(std::istream &in)
{
if( in.good())
{
G4cerr << "istream GOOD\n" << G4std::flush;
G4cerr << "istream GOOD\n" << std::flush;
}
if( in.fail() )
{
G4cerr << "istream FAIL\n" << G4std::flush;
G4cerr << "istream FAIL\n" << std::flush;
}
if( in.eof() )
{
G4cerr << "istream EOF\n" << G4std::flush;
G4cerr << "istream EOF\n" << std::flush;
}
}
@@ -66,7 +66,7 @@ void IStreamState(G4std::istream &in)
// a severity level and error message (no error MESSAGE is set for severity
// incomplete).
// * tokenList contains characters that terminate reading the value.
// * If tokenList is not zero then the G4std::istream will be read until a character
// * If tokenList is not zero then the std::istream will be read until a character
// is found matching a character in tokenlist. All values read up to the
// terminating character (delimiter) must be valid or err will be set with an
// appropriate error message. A valid value may still have been assigned
@@ -78,11 +78,11 @@ void IStreamState(G4std::istream &in)
///////////////////////////////////////////////////////////////////////////////
int
ReadInteger(SCLP23(Integer) &val, G4std::istream &in, ErrorDescriptor *err,
ReadInteger(SCLP23(Integer) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList)
{
SCLP23(Integer) i = 0;
in >> G4std::ws;
in >> std::ws;
in >> i;
int valAssigned = 0;
@@ -106,7 +106,7 @@ int
ReadInteger(SCLP23(Integer) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return ReadInteger(val, in, err, tokenList);
}
@@ -137,8 +137,8 @@ IntValidLevel (const char *attrValue, ErrorDescriptor *err,
if(clearError)
err->ClearErrorMsg();
G4std::istrstream in((char *)attrValue);
in >> G4std::ws; // skip white space
std::istrstream in((char *)attrValue);
in >> std::ws; // skip white space
char c = in.peek();
if(in.eof())
{
@@ -210,7 +210,7 @@ WriteReal(SCLP23(Real) val, SCLstring &s)
}
void
WriteReal(SCLP23(Real) val, G4std::ostream &out)
WriteReal(SCLP23(Real) val, std::ostream &out)
{
SCLstring s;
@@ -270,7 +270,7 @@ WriteReal(SCLP23(Real) val, G4std::ostream &out)
// a severity level and error message (no error MESSAGE is set for severity
// incomplete).
// * tokenList contains characters that terminate reading the value.
// * If tokenList is not zero then the G4std::istream will be read until a character
// * If tokenList is not zero then the std::istream will be read until a character
// is found matching a character in tokenlist. All values read up to the
// terminating character (delimiter) must be valid or err will be set with an
// appropriate error message. A valid value may still have been assigned
@@ -287,7 +287,7 @@ WriteReal(SCLP23(Real) val, G4std::ostream &out)
///////////////////////////////////////////////////////////////////////////////
int
ReadReal(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
ReadReal(SCLP23(Real) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList)
{
SCLP23(Real) d = 0;
@@ -300,7 +300,7 @@ ReadReal(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
char c;
ErrorDescriptor e;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
// read optional sign
c = in.peek();
@@ -378,7 +378,7 @@ ReadReal(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
int success = 0;
success = sscanf(buf," %G", &d);
*/
G4std::istrstream in2((char *)buf);
std::istrstream in2((char *)buf);
// now that we have the real the stream will be able to salvage reading
// whatever kind of format was used to represent the real.
@@ -429,7 +429,7 @@ int
ReadReal(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return ReadReal(val, in, err, tokenList);
}
@@ -460,8 +460,8 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
if(clearError)
err->ClearErrorMsg();
G4std::istrstream in((char *)attrValue);
in >> G4std::ws; // skip white space
std::istrstream in((char *)attrValue);
in >> std::ws; // skip white space
char c = in.peek();
if(in.eof())
{
@@ -496,7 +496,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
// a severity level and error message (no error MESSAGE is set for severity
// incomplete).
// * tokenList contains characters that terminate reading the value.
// * If tokenList is not zero then the G4std::istream will be read until a character
// * If tokenList is not zero then the std::istream will be read until a character
// is found matching a character in tokenlist. All values read up to the
// terminating character (delimiter) must be valid or err will be set with an
// appropriate error message. A valid value may still have been assigned
@@ -507,11 +507,11 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
///////////////////////////////////////////////////////////////////////////////
int
ReadNumber(SCLP23(Real) &val, G4std::istream &in, ErrorDescriptor *err,
ReadNumber(SCLP23(Real) &val, std::istream &in, ErrorDescriptor *err,
char *tokenList)
{
SCLP23(Real) d = 0;
in >> G4std::ws;
in >> std::ws;
in >> d;
// IStreamState(in);
@@ -534,7 +534,7 @@ int
ReadNumber(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return ReadNumber(val, in, err, tokenList);
}
@@ -566,8 +566,8 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
if(clearError)
err->ClearErrorMsg();
G4std::istrstream in((char *)attrValue);
in >> G4std::ws; // skip white space
std::istrstream in((char *)attrValue);
in >> std::ws; // skip white space
char c = in.peek();
if(in.eof())
{
@@ -596,7 +596,7 @@ NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
// return 1 if 'in' points at a quoted quote otherwise return 0
int
QuoteInString(G4std::istream& in)
QuoteInString(std::istream& in)
{
char c1, c2;
if( in.good() )
@@ -618,13 +618,13 @@ QuoteInString(G4std::istream& in)
// 'in'.
void
PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
PushPastString (std::istream& in, SCLstring &s, ErrorDescriptor *err)
{
char messageBuf[BUFSIZ];
messageBuf[0] = '\0';
char c;
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
in >> c;
if(c == STRING_DELIM)
{
@@ -668,13 +668,13 @@ PushPastString (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
// aggregates.
void
PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
PushPastImbedAggr (std::istream& in, SCLstring &s, ErrorDescriptor *err)
{
char messageBuf[BUFSIZ];
messageBuf[0] = '\0';
char c;
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == '(')
@@ -716,13 +716,13 @@ PushPastImbedAggr (G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
// to contain an aggregate as an element.
void
PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
PushPastAggr1Dim(std::istream& in, SCLstring &s, ErrorDescriptor *err)
{
char messageBuf[BUFSIZ];
messageBuf[0] = '\0';
char c;
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == '(')
@@ -762,11 +762,11 @@ PushPastAggr1Dim(G4std::istream& in, SCLstring &s, ErrorDescriptor *err)
/***************************
* FindStartOfInstance reads to the beginning of an instance marked by #
* it copies what is read to the SCLstring inst. It leaves the # on the
* G4std::istream.
* std::istream.
***************************/
Severity
FindStartOfInstance(G4std::istream& in, SCLstring& inst)
FindStartOfInstance(std::istream& in, SCLstring& inst)
{
char c =0;
ErrorDescriptor errs;
@@ -806,7 +806,7 @@ FindStartOfInstance(G4std::istream& in, SCLstring& inst)
***************************/
Severity
SkipInstance (G4std::istream& in, SCLstring& inst)
SkipInstance (std::istream& in, SCLstring& inst)
{
char c =0;
ErrorDescriptor errs;
@@ -849,12 +849,12 @@ SkipInstance (G4std::istream& in, SCLstring& inst)
***************************/
const char *
SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err)
SkipSimpleRecord(std::istream &in, SCLstring &buf, ErrorDescriptor *err)
{
char c;
SCLstring s;
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == '(') // beginning of record
{
@@ -897,11 +897,11 @@ SkipSimpleRecord(G4std::istream &in, SCLstring &buf, ErrorDescriptor *err)
***************************/
const char *
ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS)
ReadStdKeyword(std::istream& in, SCLstring &buf, int skipInitWS)
{
char c;
if(skipInitWS)
in >> G4std::ws;
in >> std::ws;
while( in.get(c) && !isspace(c) && ( isalnum(c) || (c == '_') ) )
{
@@ -916,9 +916,9 @@ ReadStdKeyword(G4std::istream& in, SCLstring &buf, int skipInitWS)
/***************************
This function returns a null terminated const char* for the
characters read from the G4std::istream up to, but not including
characters read from the std::istream up to, but not including
the first character found in the set of delimiters, or the
whitespace character. It leaves the delimiter on the G4std::istream.
whitespace character. It leaves the delimiter on the std::istream.
The string is returned in a static buffer, so it will change
the next time the function is called.
@@ -929,7 +929,7 @@ digits, underscore characters, and possibly an exclamation mark.
The "!" shall appear only once, and only as the first character.
***************************/
const char*
GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err)
GetKeyword(std::istream& in, const char* delims, ErrorDescriptor &err)
{
char c;
int sz = 1;
@@ -965,17 +965,17 @@ GetKeyword(G4std::istream& in, const char* delims, ErrorDescriptor &err)
// otherwise return 0. This gobbles up the input stream until it knows
// that it does or does not have the ENDSEC keyword (and semicolon). i.e.
// the first character that stops matching the keyword ENDSEC; (including the
// semicolon) will be put back onto the G4std::istream, everything else will remain
// semicolon) will be put back onto the std::istream, everything else will remain
// read. It is this way so that checking for the keywd the next time will
// start with the correct char or if it doesn't find it the non-matching char
// may be what you are looking for next (e.g. someone typed in END; and the
// next chars are DATA; for the beginning of the data section).
int
FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err)
FoundEndSecKywd(std::istream& in, ErrorDescriptor &err)
{
char c;
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == 'E')
@@ -995,7 +995,7 @@ FoundEndSecKywd(G4std::istream& in, ErrorDescriptor &err)
in.get(c);
if(c == 'C')
{
in >> G4std::ws;
in >> std::ws;
in.get(c);
if(c == ';')
{
@@ -1087,11 +1087,11 @@ const char * ReadComment(SCLstring &ss, const char *s)
***************************/
const char *
ReadComment(G4std::istream& in, SCLstring &s)
ReadComment(std::istream& in, SCLstring &s)
{
char c = '\0';
int commentLength = 0;
in >> G4std::ws;
in >> std::ws;
in >> c;
// it looks like a comment so far
@@ -1100,7 +1100,7 @@ ReadComment(G4std::istream& in, SCLstring &s)
in.get(c); // won't skip space
if (c == '*') // it is a comment
{
in >> G4std::ws; // skip leading comment space
in >> std::ws; // skip leading comment space
// only to keep it from completely gobbling up input
while( commentLength <= MAX_COMMENT_LENGTH )
@@ -1144,12 +1144,12 @@ ReadComment(G4std::istream& in, SCLstring &s)
}
/***************************
** Read a Print Control Directive from the G4std::istream
** Read a Print Control Directive from the std::istream
** "\F\" == formfeed
** "\N\" == newline
***************************/
Severity
ReadPcd(G4std::istream& in)
ReadPcd(std::istream& in)
{
char c;
in.get(c);
@@ -1168,15 +1168,15 @@ ReadPcd(G4std::istream& in)
/******************************
This function reads through token separators
from an G4std::istream. It returns when a token
separator is not the next thing on the G4std::istream.
from an std::istream. It returns when a token
separator is not the next thing on the std::istream.
The token separators are blanks, explicit print control directives,
and comments.
Part 21 considers the blank to be the space character,
but this function considers blanks to be the return value of isspace(c)
******************************/
void
ReadTokenSeparator(G4std::istream& in, SCLstring *comments)
ReadTokenSeparator(std::istream& in, SCLstring *comments)
{
char c;
SCLstring s; // used if need to read a comment
@@ -1190,7 +1190,7 @@ ReadTokenSeparator(G4std::istream& in, SCLstring *comments)
while (in)
{
in >> G4std::ws; // skip white space.
in >> std::ws; // skip white space.
c = in.peek(); // look at next char on input stream
switch (c)
source/geometry/solids/STEP/src/scl_char_str_list.cc
+1 -1
View File
@@ -97,7 +97,7 @@ int scl_char_str__list::Index (scl_char_str_ptr v) {
scl_char_str_ptr& scl_char_str__list::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
source/geometry/solids/STEP/src/scl_string.cc
+2 -2
View File
@@ -10,13 +10,13 @@
* and is not subject to copyright.
*/
/* $Id: scl_string.cc,v 1.4 2001/04/20 19:07:14 gcosmo Exp $ */
/* $Id: scl_string.cc,v 1.5 2003/06/06 17:07:35 gcosmo Exp $ */
#include <scl_string.h>
#include <stdio.h>
/*******************************************************************/
void
SCLstring::PrintContents(G4std::ostream &out) const
SCLstring::PrintContents(std::ostream &out) const
{
if(_strBuf)
{
source/geometry/solids/STEP/src/sdaiApplication_instance.cc
+25 -25
View File
@@ -10,9 +10,9 @@
* and is not subject to copyright.
*/
/* $Id: sdaiApplication_instance.cc,v 1.2 2000/11/20 18:15:04 gcosmo Exp $ */
/* $Id: sdaiApplication_instance.cc,v 1.3 2003/06/06 17:07:35 gcosmo Exp $ */
//static char rcsid[] ="$Id: sdaiApplication_instance.cc,v 1.2 2000/11/20 18:15:04 gcosmo Exp $";
//static char rcsid[] ="$Id: sdaiApplication_instance.cc,v 1.3 2003/06/06 17:07:35 gcosmo Exp $";
#include <sdai.h>
//#include <STEPentity.h>
@@ -164,7 +164,7 @@ SCLP23(Application_instance)::AddP21Comment(SCLstring &s, int replace)
}
void
SCLP23(Application_instance)::STEPwrite_reference (G4std::ostream& out)
SCLP23(Application_instance)::STEPwrite_reference (std::ostream& out)
{
out << "#" << STEPfile_id;
}
@@ -378,13 +378,13 @@ void SCLP23(Application_instance)::EnforceOptionality(int on)
*/
/******************************************************************
** Procedure: beginSTEPwrite
** Parameters: G4std::ostream& out -- stream to write to
** Parameters: std::ostream& out -- stream to write to
** Returns:
** Side Effects: writes out the SCOPE section for an entity
** Status: stub
******************************************************************/
void SCLP23(Application_instance)::beginSTEPwrite(G4std::ostream& out)
void SCLP23(Application_instance)::beginSTEPwrite(std::ostream& out)
{
out << "begin STEPwrite ... \n" ;
out.flush();
@@ -399,7 +399,7 @@ void SCLP23(Application_instance)::beginSTEPwrite(G4std::ostream& out)
/******************************************************************
** Procedure: STEPwrite
** Parameters: G4std::ostream& out -- stream to write to
** Parameters: std::ostream& out -- stream to write to
** Returns:
** Side Effects: writes out the data associated with an instance
in STEP format
@@ -408,7 +408,7 @@ void SCLP23(Application_instance)::beginSTEPwrite(G4std::ostream& out)
******************************************************************/
void
SCLP23(Application_instance)::STEPwrite(G4std::ostream& out, const char *currSch,
SCLP23(Application_instance)::STEPwrite(std::ostream& out, const char *currSch,
int writeComments)
{
SCLstring tmp;
@@ -428,14 +428,14 @@ SCLP23(Application_instance)::STEPwrite(G4std::ostream& out, const char *currSch
out << ");\n";
}
void SCLP23(Application_instance)::endSTEPwrite(G4std::ostream& out)
void SCLP23(Application_instance)::endSTEPwrite(std::ostream& out)
{
out << "end STEPwrite ... \n" ;
out.flush();
}
void
SCLP23(Application_instance)::WriteValuePairs(G4std::ostream& out,
SCLP23(Application_instance)::WriteValuePairs(std::ostream& out,
const char *currSch,
int writeComments, int mixedCase)
{
@@ -569,14 +569,14 @@ SCLP23(Application_instance)::PrependEntityErrMsg()
** Procedure: SCLP23(Application_instance)::STEPread_error
** Parameters: char c -- character which caused error
** int i -- index of attribute which caused error
** G4std::istream& in -- input stream for recovery
** std::istream& in -- input stream for recovery
** Returns:
** Description: reports the error found, reads until it finds the end of an
** instance. i.e. a close quote followed by a semicolon optionally having
** whitespace between them.
******************************************************************/
void
SCLP23(Application_instance)::STEPread_error(char c, int i, G4std::istream& in)
SCLP23(Application_instance)::STEPread_error(char c, int i, std::istream& in)
{
char errStr[BUFSIZ];
errStr[0] = '\0';
@@ -634,7 +634,7 @@ SCLP23(Application_instance)::STEPread_error(char c, int i, G4std::istream& in)
}
if(in.good() && (c == ')') )
{
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
in.get(c);
tmp.Append(c);
// G4cerr << c;
@@ -667,14 +667,14 @@ SCLP23(Application_instance)::STEPread_error(char c, int i, G4std::istream& in)
** Parameters: int id
** int idIncrement
** InstMgr instances
** G4std::istream& in
** std::istream& in
** Side Effects: gobbles up input stream
** Status:
******************************************************************/
Severity
SCLP23(Application_instance)::STEPread(int id, int idIncr,
InstMgr * instance_set, G4std::istream& in,
InstMgr * instance_set, std::istream& in,
const char *currSch, int useTechCor)
{
STEPfile_id = id;
@@ -686,7 +686,7 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
ClearError(1);
in >> G4std::ws;
in >> std::ws;
in >> c; // read the open paren
if( c != '(' )
{
@@ -695,7 +695,7 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
" Missing initial open paren... Trying to recover.\n");
in.putback(c); // assume you can recover by reading 1st attr value
}
in >> G4std::ws;
in >> std::ws;
int n = attributes.list_length();
if( n == 0) // no attributes
@@ -708,12 +708,12 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
for (i = 0 ; i < n; i++) {
if( attributes[i].aDesc->AttrType() == AttrType_Redefining )
{
in >> G4std::ws;
in >> std::ws;
c = in.peek();
if(!useTechCor) // i.e. use pre-technical corrigendum encoding
{
in >> c; // read what should be the '*'
in >> G4std::ws;
in >> std::ws;
if(c == '*')
{
in >> c; // read the delimiter i.e. ',' or ')'
@@ -758,7 +758,7 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
in >> c;
G4cout << "Entity #" << STEPfile_id
<< " skipping redefined attribute "
<< attributes[i].aDesc->Name() << G4endl << G4endl << G4std::flush;
<< attributes[i].aDesc->Name() << G4endl << G4endl << std::flush;
}
// increment counter to read following attr since these attrs
// aren't written or read => there won't be a delimiter either
@@ -859,7 +859,7 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
}
if(in.good() && (c == ')') )
{
in >> G4std::ws; // skip whitespace
in >> std::ws; // skip whitespace
in.get(c);
tmp.Append(c);
// G4cerr << c;
@@ -882,14 +882,14 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
///////////////////////////////////////////////////////////////////////////////
SCLP23(Application_instance) *
ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(std::istream &in, ErrorDescriptor *err, char *tokenList,
InstMgr * instances, int addFileId)
{
char c;
char errStr[BUFSIZ];
errStr[0] = '\0';
in >> G4std::ws;
in >> std::ws;
in >> c;
switch (c)
{
@@ -986,7 +986,7 @@ SCLP23(Application_instance) *
ReadEntityRef(const char * s, ErrorDescriptor *err, char *tokenList,
InstMgr * instances, int addFileId)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return ReadEntityRef(in, err, tokenList, instances, addFileId);
}
@@ -1218,7 +1218,7 @@ SCLP23(Application_instance)::AttributeCount () {
#ifdef OBSOLETE
Severity
SCLP23(Application_instance)::ReadAttrs(int id, int addFileId,
class InstMgr * instance_set, G4std::istream& in)
class InstMgr * instance_set, std::istream& in)
{
char c ='\0';
char errStr[BUFSIZ];
@@ -1281,7 +1281,7 @@ SCLP23(Application_instance)::ReadAttrs(int id, int addFileId,
}
else if(c == ')')
{
in >> G4std::ws;
in >> std::ws;
char z = in.peek();
if (z == ';')
{
source/geometry/solids/STEP/src/sdaiApplication_instance_set.cc
+1 -1
View File
@@ -126,7 +126,7 @@ int SCLP23(Application_instance__set)::Index (SCLP23(Application_instance_ptr) v
SCLP23(Application_instance_ptr)& SCLP23(Application_instance__set)::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
source/geometry/solids/STEP/src/sdaiDaObject.cc
+1 -1
View File
@@ -279,7 +279,7 @@ SCLP23(DAObject__set)::retrieve(int index)
SCLP23(DAObject_ptr)& SCLP23(DAObject__set)::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
source/geometry/solids/STEP/src/sdaiEntity_extent_set.cc
+2 -2
View File
@@ -174,7 +174,7 @@ SCLP23(Entity_extent__set)::retrieve(int index)
#ifndef __OSTORE__
SCLP23(Entity_extent_ptr)& SCLP23(Entity_extent__set)::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
@@ -307,7 +307,7 @@ int Entity_extent__set::Index (Entity_extent_ptr v) {
Entity_extent_ptr& Entity_extent__set::operator[] (int index) {
Check(index);
// _count = G4std::max(_count, index+1);
// _count = std::max(_count, index+1);
_count = ( (_count > index+1) ? _count : (index+1) );
return _buf[index];
}
source/geometry/solids/STEP/src/sdaiEnum.cc
+20 -20
View File
@@ -15,11 +15,11 @@
* and is not subject to copyright.
*/
/* $Id: sdaiEnum.cc,v 1.1 2000/01/21 13:43:17 gcosmo Exp $ */
/* $Id: sdaiEnum.cc,v 1.2 2003/06/06 17:07:36 gcosmo Exp $ */
//static char rcsid[] ="$Id: sdaiEnum.cc,v 1.1 2000/01/21 13:43:17 gcosmo Exp $";
//static char rcsid[] ="$Id: sdaiEnum.cc,v 1.2 2003/06/06 17:07:36 gcosmo Exp $";
#include "g4std/strstream"
#include <strstream>
//#ifndef SCLP23(TRUE)
//#ifndef SCLP23(FALSE)
@@ -216,7 +216,7 @@ SCLP23(LOGICAL)::set_value (const char * n) {
Severity
SCLP23(LOGICAL)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
SCLP23(LOGICAL)::ReadEnum(std::istream& in, ErrorDescriptor *err, int AssignVal,
int needDelims)
{
if(AssignVal)
@@ -229,7 +229,7 @@ SCLP23(LOGICAL)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVa
int validDelimiters = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
if( in.good() )
{
@@ -346,7 +346,7 @@ SCLP23(LOGICAL)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVa
err->AppendToUserMsg(messageBuf);
}
}
else // hit eof (assuming there was no error state for G4std::istream passed in)
else // hit eof (assuming there was no error state for std::istream passed in)
{
err->GreaterSeverity(SEVERITY_INCOMPLETE);
}
@@ -532,7 +532,7 @@ SCLP23(Enum)::nullify() // change the receiver to an unset status
/******************************************************************
** Procedure: DebugDisplay
** Parameters: G4std::ostream& out
** Parameters: std::ostream& out
** Returns:
** Description: prints out some information on the enumerated
** item for debugging purposes
@@ -540,7 +540,7 @@ SCLP23(Enum)::nullify() // change the receiver to an unset status
** Status: ok 2/1/91
******************************************************************/
void
SCLP23(Enum)::DebugDisplay (G4std::ostream& out) const
SCLP23(Enum)::DebugDisplay (std::ostream& out) const
{
SCLstring tmp;
out << "Current " << Name() << " value: " << G4endl
@@ -575,7 +575,7 @@ SCLP23(Enum)::DebugDisplay (G4std::ostream& out) const
// true or false => non-matching delimiters are flagged as an error
Severity
SCLP23(Enum)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
SCLP23(Enum)::ReadEnum(std::istream& in, ErrorDescriptor *err, int AssignVal,
int needDelims)
{
if(AssignVal)
@@ -588,7 +588,7 @@ SCLP23(Enum)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
int validDelimiters = 1;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
if( in.good() )
{
@@ -705,7 +705,7 @@ SCLP23(Enum)::ReadEnum(G4std::istream& in, ErrorDescriptor *err, int AssignVal,
err->AppendToUserMsg(messageBuf);
}
}
else // hit eof (assuming there was no error state for G4std::istream passed in)
else // hit eof (assuming there was no error state for std::istream passed in)
{
err->GreaterSeverity(SEVERITY_INCOMPLETE);
}
@@ -724,7 +724,7 @@ SCLP23(Enum)::StrToVal (const char * s)
Severity
SCLP23(Enum)::StrToVal (const char * s, ErrorDescriptor *err, int optional)
{
G4std::istrstream in ((char *)s); // sz defaults to length of s
std::istrstream in ((char *)s); // sz defaults to length of s
Severity sev = ReadEnum(in, err, 1, 0);
if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
@@ -737,13 +737,13 @@ SCLP23(Enum)::StrToVal (const char * s, ErrorDescriptor *err, int optional)
Severity
SCLP23(Enum)::STEPread (const char *s, ErrorDescriptor *err, int optional)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return STEPread (in, err, optional);
}
// reads an enumerated value in STEP file format
Severity
SCLP23(Enum)::STEPread (G4std::istream& in, ErrorDescriptor *err, int optional)
SCLP23(Enum)::STEPread (std::istream& in, ErrorDescriptor *err, int optional)
{
Severity sev = ReadEnum(in, err, 1, 1);
if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
@@ -766,7 +766,7 @@ SCLP23(Enum)::asStr (SCLstring &s) const {
}
void
SCLP23(Enum)::STEPwrite (G4std::ostream& out) const {
SCLP23(Enum)::STEPwrite (std::ostream& out) const {
if( is_null() )
out << '$';
else
@@ -813,14 +813,14 @@ SCLP23(Enum)::set_elements (const char * const e []) {
}
#endif
Severity
SCLP23(Enum)::EnumValidLevel(G4std::istream &in, ErrorDescriptor *err,
SCLP23(Enum)::EnumValidLevel(std::istream &in, ErrorDescriptor *err,
int optional, char *tokenList,
int needDelims, int clearError)
{
if(clearError)
err->ClearErrorMsg();
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
char c = ' ';
c = in.peek();
if(c == '$' || in.eof())
@@ -857,7 +857,7 @@ SCLP23(Enum)::EnumValidLevel(const char *value, ErrorDescriptor *err,
int optional, char *tokenList,
int needDelims, int clearError)
{
G4std::istrstream in((char *)value);
std::istrstream in((char *)value);
return EnumValidLevel (in, err, optional, tokenList, needDelims,
clearError);
/*
@@ -994,7 +994,7 @@ SCLP23(Enum)::operator= (const SCLP23(Enum)& Senum)
return *this;
}
G4std::ostream &operator<< ( G4std::ostream& out, const SCLP23(Enum)& a )
std::ostream &operator<< ( std::ostream& out, const SCLP23(Enum)& a )
{
SCLstring tmp;
out << a.asStr( tmp );
@@ -1071,7 +1071,7 @@ SCLP23(Enum)::StrToVal (const char * s, ErrorDescriptor *err, int optional)
Severity
SCLP23(Enum)::STEPread (G4std::istream& in, ErrorDescriptor *err, int optional)
SCLP23(Enum)::STEPread (std::istream& in, ErrorDescriptor *err, int optional)
{
char enumValue [BUFSIZ];
char c;
source/geometry/solids/STEP/src/sdaiSelect.cc
+17 -17
View File
@@ -10,19 +10,19 @@
* and is not subject to copyright.
*/
/* $Id: sdaiSelect.cc,v 1.1 2000/01/21 13:43:18 gcosmo Exp $ */
/* $Id: sdaiSelect.cc,v 1.2 2003/06/06 17:07:36 gcosmo Exp $ */
#include <stdio.h> // to get the BUFSIZ #define
#include <ExpDict.h>
#include "g4std/strstream"
#include <strstream>
//#include <STEPentity.h>
#include <scl_string.h>
#include <sdai.h>
#include <STEPattribute.h>
#ifdef SCL_LOGGING
#include "g4std/fstream"
extern G4std::ofstream *logStream;
#include <fstream>
extern std::ofstream *logStream;
#endif
/**********
@@ -199,7 +199,7 @@ SCLP23(Select)::SelectValidLevel(const char *attrValue, ErrorDescriptor *err,
// (attrValue, CurrentUnderlyingType () -> Name (), err, im);
// else
G4std::istrstream strtmp (attrValue);
std::istrstream strtmp (attrValue);
s = tmp -> STEPread (strtmp, err, im);
delete tmp;
return s;
@@ -260,7 +260,7 @@ SCLP23(Select)::StrToVal(const char *Val, const char *selectType,
case INTEGER_TYPE:
default:
{
G4std::istrstream strtmp (Val);
std::istrstream strtmp (Val);
err->GreaterSeverity( STEPread_content (strtmp) );
if(_error.severity() != SEVERITY_NULL)
err->AppendFromErrorArg(&_error);
@@ -272,7 +272,7 @@ SCLP23(Select)::StrToVal(const char *Val, const char *selectType,
// updated to Technical Corrigendum. DAS 2/4/97
Severity
SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
SCLP23(Select)::STEPread (std::istream& in, ErrorDescriptor *err,
InstMgr *instances, const char* utype,
int addFileId, const char *currSch)
{
@@ -294,7 +294,7 @@ SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
{
if( SetUnderlyingType( CanBeSet( utype, currSch ) ) )
{ // assign the value to the underlying type
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
if( (underlying_type->Type() == REFERENCE_TYPE) &&
(underlying_type->NonRefType() == sdaiSELECT) )
{ // See comments below for a similar code segment.
@@ -307,7 +307,7 @@ SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
}
return err->severity();
}
in >> G4std::ws;
in >> std::ws;
in >> c;
// c = in.peek();
@@ -348,7 +348,7 @@ SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
// appear first ("selX("), so even if we read a valid element of
// selX, selX can't be the underlying type. That can only be the
// case if "selX" appears first and is what we just read.
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
if( (underlying_type->Type() == REFERENCE_TYPE) &&
(underlying_type->NonRefType() == sdaiSELECT) )
{
@@ -379,7 +379,7 @@ SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
}
err->AppendToDetailMsg (Error ());
err->GreaterSeverity( severity () );
in >> G4std::ws >> c;
in >> std::ws >> c;
if( c != ')' )
{
err->AppendToDetailMsg(
@@ -601,7 +601,7 @@ SCLP23(Select)::STEPread (G4std::istream& in, ErrorDescriptor *err,
// updated to Technical Corrigendum DAS Feb 4, 1997
void
SCLP23(Select)::STEPwrite(G4std::ostream& out, const char *currSch) const
SCLP23(Select)::STEPwrite(std::ostream& out, const char *currSch) const
{
if (!exists ()) {
out << "$";
@@ -668,7 +668,7 @@ SCLP23(Select)::STEPwrite(G4std::ostream& out, const char *currSch) const
}
void
SCLP23(Select)::STEPwrite_verbose(G4std::ostream& out, const char *currSch) const
SCLP23(Select)::STEPwrite_verbose(std::ostream& out, const char *currSch) const
{
SCLstring tmp;
out << StrToUpper( CurrentUnderlyingType()->Name(currSch), tmp) << "(";
@@ -679,9 +679,9 @@ SCLP23(Select)::STEPwrite_verbose(G4std::ostream& out, const char *currSch) cons
const char *
SCLP23(Select)::STEPwrite(SCLstring& s, const char *currSch) const
{
G4std::strstream buf;
std::strstream buf;
STEPwrite (buf, currSch);
buf << G4std::ends; // have to add the terminating \0 char
buf << std::ends; // have to add the terminating \0 char
char * tmp;
tmp = buf.str ();
s = tmp;
@@ -700,10 +700,10 @@ SCLP23(Select)::STEPwrite(SCLstring& s, const char *currSch) const
char*
SCLP23(Select)::asStr() const
{
G4std::strstream buf;
std::strstream buf;
STEPwrite (buf);
/* STEPwrite_content (buf);*/
buf << G4std::ends; // have to add the terminating \0 char
buf << std::ends; // have to add the terminating \0 char
return buf.str (); // need to delete this space
}
#endif
source/geometry/solids/STEP/src/sdaiString.cc
+8 -12
View File
@@ -9,10 +9,10 @@
* and is not subject to copyright.
*/
/* $Id: sdaiString.cc,v 1.2 2001/11/29 16:46:51 gcosmo Exp $ */
/* $Id: sdaiString.cc,v 1.3 2003/06/06 17:07:36 gcosmo Exp $ */
#include <sdai.h>
#include "g4std/strstream"
#include <strstream>
SCLP23(String)&
@@ -23,7 +23,7 @@ SCLP23(String)::operator= (const char* s)
}
void
SCLP23(String)::STEPwrite (G4std::ostream& out) const
SCLP23(String)::STEPwrite (std::ostream& out) const
{
const char *str = 0;
// strings that exist but do not contain any chars should be written as '',
@@ -83,21 +83,17 @@ SCLP23(String)::StrToVal (const char * s)
// STEPread reads a string in exchange file format
// starting with a single quote
Severity
SCLP23(String)::STEPread (G4std::istream& in, ErrorDescriptor *err)
SCLP23(String)::STEPread (std::istream& in, ErrorDescriptor *err)
{
int foundEndQuote = 0; // need so this string is not ok: 'hi''
set_null (); // clear the old string
char c;
in >> G4std::ws; // skip white space
in >> std::ws; // skip white space
in >> c;
// remember the current format state to restore the previous settings
#ifdef G4USE_STD_NAMESPACE
// remember the current format state to restore the previous settings
std::ios::fmtflags flags = in.flags();
#else
long int flags = in.flags();
#endif
in.unsetf(G4std::ios::skipws);
in.unsetf(std::ios::skipws);
if (c == STRING_DELIM)
{
@@ -148,6 +144,6 @@ SCLP23(String)::STEPread (G4std::istream& in, ErrorDescriptor *err)
Severity
SCLP23(String)::STEPread (const char *s, ErrorDescriptor *err)
{
G4std::istrstream in((char *)s);
std::istrstream in((char *)s);
return STEPread (in, err);
}