[warning-fix][initialization-order]

This commit is contained in:
tpaviot committed 2011-08-14 13:54:34 +02:00
1 parent e64899c311
commit b6bebbb01f
4 files changed
+17 -18

No files matched your search

+3 -4
View File
@@ -41,13 +41,12 @@ STEPfile::STEPfile( Registry & r, InstMgr & i, const char * filename )
: _reg( &r ), _instances( &i ),
#else
:
_reg( r ), _instances( i ),
_instances( i ), _reg( r ),
#endif
_headerId( 0 ), _maxErrorCount( 5000 ),
_fileIdIncr( 0 ), _headerId( 0 ),
_fileName( 0 ), _entsNotCreated( 0 ), _entsInvalid( 0 ),
_entsIncomplete( 0 ), _entsWarning( 0 ),
_errorCount( 0 ), _warningCount( 0 ),
_fileIdIncr( 0 )
_errorCount( 0 ), _warningCount( 0 ), _maxErrorCount( 5000 )
{
SetFileType( VERSION_CURRENT );
+1 -1
View File
@@ -25,7 +25,7 @@ const TypeDescriptor * t_sdaiLOGICAL;
static int uniqueNames( const char *, const SchRename * );
Registry::Registry( CF_init initFunct )
: entity_cnt( 0 ), all_ents_cnt( 0 ), col( 0 ) {
: col( 0 ), entity_cnt( 0 ), all_ents_cnt( 0 ) {
// if(NilSTEPentity == 0)
// NilSTEPentity = new SCLP23(Application_instance);
+10 -10
View File
@@ -20,29 +20,29 @@
// references to inline functions
STEPattribute::STEPattribute( const STEPattribute & a )
: aDesc( a.aDesc ), _derive( 0 ), _redefAttr( 0 ) {}
: _derive( 0 ), _redefAttr( 0 ), aDesc( a.aDesc ) {}
// INTEGER
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( Integer ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.i = p;
}
// BINARY
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( Binary ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.b = p;
}
// STRING
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( String ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.S = p;
}
// REAL & NUMBER
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( Real ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.r = p;
}
@@ -54,32 +54,32 @@ STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( Real ) *p
// ENTITY
STEPattribute::STEPattribute( const class AttrDescriptor & d,
SCLP23( Application_instance )* *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.c = p;
}
// AGGREGATE
STEPattribute::STEPattribute( const class AttrDescriptor & d, STEPaggregate * p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.a = p;
}
// ENUMERATION and Logical
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLP23( Enum ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.e = p;
}
// SELECT
STEPattribute::STEPattribute( const class AttrDescriptor & d,
class SCLP23( Select ) *p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.sh = p;
}
// UNDEFINED
STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLundefined * p )
: aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
: _derive( 0 ), _redefAttr( 0 ), aDesc( &d ) {
ptr.u = p;
}
+3 -3
View File
@@ -121,7 +121,7 @@ class EntList {
friend ostream & operator<< ( ostream &, MultList & );
public:
EntList( JoinType j ) : join(j), prev(0), next(0), viable(UNKNOWN),
EntList( JoinType j ) : join(j), next(0), prev(0), viable(UNKNOWN),
level(0) {}
virtual ~EntList() {}
MatchType viableVal() { return viable; }
@@ -168,7 +168,7 @@ class SimpleList : public EntList {
friend ostream & operator<< ( ostream &, SimpleList & );
public:
SimpleList( const char *n ) : I_marked(NOMARK), EntList(SIMPLE)
SimpleList( const char *n ) : EntList(SIMPLE), I_marked(NOMARK)
{ strcpy( name, n ); }
~SimpleList() {}
int operator== ( const char *nm )
@@ -292,7 +292,7 @@ class ComplexList {
friend ostream & operator<< ( ostream &, ComplexList & );
public:
ComplexList( AndList *alist = NULL ) : head(alist), list(0), next(0),
ComplexList( AndList *alist = NULL ) : list(0), head(alist), next(0),
abstract(0), dependent(0),
multSupers(0) {}
ComplexList( Entity, ComplexCollect * );