BRL-CAD/stepcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added default namespace for Boolean type.

Browse Source 
* In borland type Boolean conflicts with System::Boolean so it is needed
  to replace Boolean with ::Boolean.
This commit is contained in:
davyw
2012-01-04 23:12:47 +01:00
parent 2d26da7d24
commit 3a9fa997b3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cldai/sdaiDaObject.h
+6 -6
View File
@@ -373,9 +373,9 @@ class SCL_DAI_EXPORT SDAI_DAObject_SDAI : public SDAI_DAObject {
5.3.10.1.6 Is instance of
*/
Boolean IsInstanceOf( const char * typeName ) const;
::Boolean IsInstanceOf( const char * typeName ) const;
#ifdef SDAI_CPP_LATE_BINDING
Boolean IsInstanceOf( const Entity_ptr & otherEntity ) const;
::Boolean IsInstanceOf( const Entity_ptr & otherEntity ) const;
#endif
/*
@@ -395,9 +395,9 @@ class SCL_DAI_EXPORT SDAI_DAObject_SDAI : public SDAI_DAObject {
5.3.10.1.7 Is kind of
*/
Boolean IsKindOf( const char * typeName ) const;
::Boolean IsKindOf( const char * typeName ) const;
#ifdef SDAI_CPP_LATE_BINDING
Boolean IsKindOf( const Entity_ptr & theType ) const;
::Boolean IsKindOf( const Entity_ptr & theType ) const;
#endif
/*
@@ -415,10 +415,10 @@ class SCL_DAI_EXPORT SDAI_DAObject_SDAI : public SDAI_DAObject {
5.3.10.1.8 Is SDAI kind of
*/
Boolean IsSDAIKindOf( const char * typeName ) const;
::Boolean IsSDAIKindOf( const char * typeName ) const;
#ifdef SDAI_CPP_LATE_BINDING
Boolean IsSDAIKindOf( const Entity_ptr & theType ) const;
::Boolean IsSDAIKindOf( const Entity_ptr & theType ) const;
#endif
/*
src/cldai/sdaiEnum.h
+3 -3
View File
@@ -124,7 +124,7 @@ class SCL_DAI_EXPORT SDAI_BOOLEAN :
const char * Name() const;
SDAI_BOOLEAN( char * val = 0 );
SDAI_BOOLEAN( Boolean state );
SDAI_BOOLEAN( ::Boolean state );
SDAI_BOOLEAN( const SDAI_BOOLEAN & source );
SDAI_BOOLEAN( int i );
SDAI_BOOLEAN( const SDAI_LOGICAL & val );
@@ -133,10 +133,10 @@ class SCL_DAI_EXPORT SDAI_BOOLEAN :
virtual int no_elements() const;
virtual const char * element_at( int n ) const;
operator Boolean() const;
operator ::Boolean() const;
SDAI_BOOLEAN & operator=( const SDAI_LOGICAL & t );
SDAI_BOOLEAN & operator=( const Boolean t );
SDAI_BOOLEAN & operator=( const ::Boolean t );
SDAI_LOGICAL operator==( const SDAI_LOGICAL & t ) const;
};