Skip to content

Commit 1deb8e7

Browse files
author
Nicholas Reed
committed
Another int/bool substitution. This is SCL git b277759; r50791 was actually SCL git 1b69382.
1 parent dd71942 commit 1deb8e7

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎src/cleditor/STEPfile.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ int STEPfile::ReadWorkingData1( istream & in ) {
527527
** Description: reads in the data portion of the instances
528528
** in an exchange file
529529
******************************************************************/
530-
int STEPfile::ReadData2( istream & in, int useTechCor ) {
530+
int STEPfile::ReadData2( istream & in, bool useTechCor ) {
531531
_entsInvalid = 0;
532532
_entsIncomplete = 0;
533533
_entsWarning = 0;
@@ -641,7 +641,7 @@ int STEPfile::ReadData2( istream & in, int useTechCor ) {
641641
}
642642

643643

644-
int STEPfile::ReadWorkingData2( istream & in, int useTechCor ) {
644+
int STEPfile::ReadWorkingData2( istream & in, bool useTechCor ) {
645645
return ReadData2( in, useTechCor );
646646
}
647647

@@ -1117,7 +1117,7 @@ Severity STEPfile::ReadScopeInstances( istream & in ) {
11171117
the STEPfile ErrorDescriptor.
11181118
*****************************************************/
11191119
SDAI_Application_instance * STEPfile::ReadInstance( istream & in, ostream & out, std::string & cmtStr,
1120-
int useTechCor ) {
1120+
bool useTechCor ) {
11211121
Severity sev = SEVERITY_NULL;
11221122

11231123
std::string tmpbuf;
@@ -1570,7 +1570,7 @@ void STEPfile::WriteValuePairsData( ostream & out, int writeComments, int mixedC
15701570
}
15711571
}
15721572

1573-
Severity STEPfile::AppendFile( istream * in, int useTechCor ) {
1573+
Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
15741574
Severity rval = SEVERITY_NULL;
15751575
char errbuf[BUFSIZ];
15761576

‎src/cleditor/STEPfile.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ class STEPfile {
133133
int SetFileType( FileTypeCode ft = VERSION_CURRENT );
134134

135135
//Reading and Writing
136-
Severity ReadExchangeFile( const std::string filename = "", int useTechCor = 1 );
137-
Severity AppendExchangeFile( const std::string filename = "", int useTechCor = 1 );
136+
Severity ReadExchangeFile( const std::string filename = "", bool useTechCor = 1 );
137+
Severity AppendExchangeFile( const std::string filename = "", bool useTechCor = 1 );
138138

139-
Severity ReadWorkingFile( const std::string filename = "", int useTechCor = 1 );
140-
Severity AppendWorkingFile( const std::string filename = "", int useTechCor = 1 );
139+
Severity ReadWorkingFile( const std::string filename = "", bool useTechCor = 1 );
140+
Severity AppendWorkingFile( const std::string filename = "", bool useTechCor = 1 );
141141

142-
Severity AppendFile( istream * in, int useTechCor = 1 ) ;
142+
Severity AppendFile( istream * in, bool useTechCor = 1 ) ;
143143

144144
Severity WriteExchangeFile( ostream & out, int validate = 1,
145145
int clearError = 1, int writeComments = 1 );
@@ -179,11 +179,11 @@ class STEPfile {
179179

180180
int ReadData1( istream & in ); // first pass to create instances
181181
// second pass to read instances
182-
int ReadData2( istream & in, int useTechCor = 1 );
182+
int ReadData2( istream & in, bool useTechCor = true );
183183

184184
// obsolete
185185
int ReadWorkingData1( istream & in );
186-
int ReadWorkingData2( istream & in, int useTechCor = 1 );
186+
int ReadWorkingData2( istream & in, bool useTechCor = true );
187187

188188
void ReadRestOfFile( istream & in );
189189

@@ -195,7 +195,7 @@ class STEPfile {
195195

196196
// read the instance - used by ReadData2()
197197
SDAI_Application_instance * ReadInstance( istream & in, ostream & out,
198-
std::string & cmtStr, int useTechCor = 1 );
198+
std::string & cmtStr, bool useTechCor = true );
199199

200200
// reading scopes are still incomplete
201201
// these functions are stubs

‎src/cleditor/STEPfile.inline.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ std::string STEPfile::TruncFileName( const std::string filename ) const {
100100

101101

102102
/******************************************************/
103-
Severity STEPfile::ReadExchangeFile( const std::string filename, int useTechCor ) {
103+
Severity STEPfile::ReadExchangeFile( const std::string filename, bool useTechCor ) {
104104
_error.ClearErrorMsg();
105105
_errorCount = 0;
106106
istream * in = OpenInputFile( filename );
@@ -119,7 +119,7 @@ Severity STEPfile::ReadExchangeFile( const std::string filename, int useTechCor
119119
return rval;
120120
}
121121

122-
Severity STEPfile::AppendExchangeFile( const std::string filename, int useTechCor ) {
122+
Severity STEPfile::AppendExchangeFile( const std::string filename, bool useTechCor ) {
123123
_error.ClearErrorMsg();
124124
_errorCount = 0;
125125
istream * in = OpenInputFile( filename );
@@ -132,7 +132,7 @@ Severity STEPfile::AppendExchangeFile( const std::string filename, int useTechCo
132132
return rval;
133133
}
134134

135-
Severity STEPfile::ReadWorkingFile( const std::string filename, int useTechCor ) {
135+
Severity STEPfile::ReadWorkingFile( const std::string filename, bool useTechCor ) {
136136
_error.ClearErrorMsg();
137137
_errorCount = 0;
138138
istream * in = OpenInputFile( filename );
@@ -152,7 +152,7 @@ Severity STEPfile::ReadWorkingFile( const std::string filename, int useTechCor )
152152
}
153153

154154

155-
Severity STEPfile::AppendWorkingFile( const std::string filename, int useTechCor ) {
155+
Severity STEPfile::AppendWorkingFile( const std::string filename, bool useTechCor ) {
156156
_error.ClearErrorMsg();
157157
_errorCount = 0;
158158
istream * in = OpenInputFile( filename );

‎src/clstepcore/STEPcomplex.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ STEPcomplex::AppendEntity( STEPcomplex * stepc ) {
280280
// READ
281281
Severity
282282
STEPcomplex::STEPread( int id, int addFileId, class InstMgr * instance_set,
283-
istream & in, const char * currSch, int useTechCor ) {
283+
istream & in, const char * currSch, bool useTechCor ) {
284284
char c;
285285
std::string typeNm;
286286
STEPcomplex * stepc = 0;

‎src/clstepcore/STEPcomplex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class STEPcomplex : public SDAI_Application_instance {
3434
virtual Severity STEPread( int id, int addFileId,
3535
class InstMgr * instance_set,
3636
istream & in = cin, const char * currSch = NULL,
37-
int useTechCor = 1 );
37+
bool useTechCor = true );
3838

3939
virtual void STEPread_error( char c, int index, istream & in );
4040

‎src/clstepcore/sdaiApplication_instance.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ void SDAI_Application_instance::STEPread_error( char c, int i, istream & in ) {
505505

506506
Severity SDAI_Application_instance::STEPread( int id, int idIncr,
507507
InstMgr * instance_set, istream & in,
508-
const char * currSch, int useTechCor ) {
508+
const char * currSch, bool useTechCor ) {
509509
STEPfile_id = id;
510510
char c = '\0';
511511
char errStr[BUFSIZ];

‎src/clstepcore/sdaiApplication_instance.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class SDAI_Application_instance : public SDAI_DAObject_SDAI {
9595
virtual Severity STEPread( int id, int addFileId,
9696
class InstMgr * instance_set,
9797
istream & in = cin, const char * currSch = NULL,
98-
int useTechCor = 1 );
98+
bool useTechCor = true );
9999
virtual void STEPread_error( char c, int index, istream & in );
100100

101101
// WRITE

‎src/express/dict.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ void DICTprint( Dictionary dict ) {
5656
}
5757
}
5858

59-
/** Initialize the Dictionary module */ void
60-
DICTinitialize( void ) {
59+
/** Initialize the Dictionary module */
60+
void DICTinitialize( void ) {
6161
ERROR_duplicate_decl = ERRORcreate(
6262
"Redeclaration of %s. Previous declaration was on line %d.", SEVERITY_ERROR );
6363
ERROR_duplicate_decl_diff_file = ERRORcreate(

0 commit comments

Comments
 (0)