From: Roman Lygin Date: Tue, 11 Mar 2014 10:50:04 +0000 (+0400) Subject: 0024533: Use 0 to check null handle instead of UndefinedHandleAccess X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=e7551a82316826dd75d4ff3991d388f3d35d81ee;p=occt-wok.git 0024533: Use 0 to check null handle instead of UndefinedHandleAccess Definition of macro _OCC64 removed from MSVC project files and Automake script --- diff --git a/src/MS/MS_Class.cxx b/src/MS/MS_Class.cxx index e98f4ea..d3a3d19 100755 --- a/src/MS/MS_Class.cxx +++ b/src/MS/MS_Class.cxx @@ -41,7 +41,7 @@ MS_Class::MS_Class(const Handle(TCollection_HAsciiString)& aName, if (!aPackage.IsNull()) { Handle(TCollection_HAsciiString) aFullName = MS::BuildFullName(aPackage,aName); - if (GetMetaSchema() != (MS_MetaSchemaPtr)UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { Package(aPackage); } @@ -115,7 +115,7 @@ Handle(MS_HSequenceOfClass) MS_Class::GetInherits() const { Handle(MS_HSequenceOfClass) aClassSeq = new MS_HSequenceOfClass(); - if (GetMetaSchema() != UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { Standard_Integer i; for (i = 1; i <= myInherits->Length(); i++) { @@ -165,7 +165,7 @@ Handle(TColStd_HSequenceOfHAsciiString) MS_Class::GetFullInheritsNames() Handle(MS_Type) aType; MS_Class* aClass = 0l; - if (GetMetaSchema() == UndefinedHandleAddress) { + if (GetMetaSchema() == 0) { cerr << "Error : MS_Class::GetFullInheritsNames - Cannot compute inheritance tree without MetaSchema : " << FullName()->ToCString() << endl; Standard_NoSuchObject::Raise(); @@ -219,7 +219,7 @@ Handle(MS_HSequenceOfType) MS_Class::GetUses() const { Handle(MS_HSequenceOfType) aTypeSeq; - if (GetMetaSchema() != UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { Standard_Integer i; aTypeSeq = new MS_HSequenceOfType; diff --git a/src/MS/MS_Common.cxx b/src/MS/MS_Common.cxx index 3e37942..d196477 100755 --- a/src/MS/MS_Common.cxx +++ b/src/MS/MS_Common.cxx @@ -1,7 +1,7 @@ #include #include -MS_Common::MS_Common(const Handle(TCollection_HAsciiString)& aName) : myName(aName),myFullName(aName),myMetaSchema((MS_MetaSchemaPtr)UndefinedHandleAddress) +MS_Common::MS_Common(const Handle(TCollection_HAsciiString)& aName) : myName(aName),myFullName(aName),myMetaSchema(0) { } diff --git a/src/MS/MS_GenType.cxx b/src/MS/MS_GenType.cxx index 041cb9f..134945d 100755 --- a/src/MS/MS_GenType.cxx +++ b/src/MS/MS_GenType.cxx @@ -31,7 +31,7 @@ Handle(MS_Type) MS_GenType::TYpe() const { Handle(MS_Type) tmpType; - if (GetMetaSchema() != UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { if (GetMetaSchema()->IsDefined(myType)) { tmpType = GetMetaSchema()->GetType(myType); } diff --git a/src/MS/MS_InstClass.cxx b/src/MS/MS_InstClass.cxx index d3a805f..e42f080 100755 --- a/src/MS/MS_InstClass.cxx +++ b/src/MS/MS_InstClass.cxx @@ -210,7 +210,7 @@ void MS_InstClass::Instantiates() Standard_Integer i; Standard_Boolean GenClassNotDefined = Standard_False; - if (GetMetaSchema() == UndefinedHandleAddress) { + if (GetMetaSchema() == 0) { MS_TraductionError::Raise("Error : Instantiation without MetaSchemna..."); } diff --git a/src/MS/MS_Param.cxx b/src/MS/MS_Param.cxx index 0202d64..e8ba081 100755 --- a/src/MS/MS_Param.cxx +++ b/src/MS/MS_Param.cxx @@ -93,7 +93,7 @@ Handle(MS_Type) MS_Param::Type() const { Handle(MS_Type) aType; - if (GetMetaSchema() != UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { Handle(TCollection_HAsciiString) TheTypeName = TypeName(); if (GetMetaSchema()->IsDefined(TheTypeName)) { diff --git a/src/MS/MS_PrimType.cxx b/src/MS/MS_PrimType.cxx index ffa6037..2973144 100755 --- a/src/MS/MS_PrimType.cxx +++ b/src/MS/MS_PrimType.cxx @@ -41,7 +41,7 @@ Handle(TColStd_HSequenceOfHAsciiString) MS_PrimType::GetFullInheritsNames() cons Handle(MS_Type) aType; Handle(MS_Class) aClass; - if (GetMetaSchema() == UndefinedHandleAddress) { + if (GetMetaSchema() == 0) { cerr << "Error : MS_Class::GetFullInheritsNames - Cannot compute inheritance tree without MetaSchema" << endl; Standard_NoSuchObject::Raise(); } diff --git a/src/MS/MS_Type.cxx b/src/MS/MS_Type.cxx index df17ec5..8fa15f7 100755 --- a/src/MS/MS_Type.cxx +++ b/src/MS/MS_Type.cxx @@ -33,7 +33,7 @@ void MS_Type::Package(const Handle(TCollection_HAsciiString)& aPackage) Handle(MS_Package) MS_Type::Package() const { - if (GetMetaSchema() != UndefinedHandleAddress) { + if (GetMetaSchema() != 0) { return GetMetaSchema()->GetPackage(myPackage); } else { diff --git a/src/WOKTclLib/templates/template.ac b/src/WOKTclLib/templates/template.ac index de6cfdf..f3b6a11 100644 --- a/src/WOKTclLib/templates/template.ac +++ b/src/WOKTclLib/templates/template.ac @@ -79,7 +79,7 @@ CSF_SOCKETLibs_LIB=-ldl AC_MSG_CHECKING([if platform is 64-bit]) AC_TRY_COMPILE( [], [int array[((int)sizeof(void*))-6];], - [AC_MSG_RESULT([yes]); ARCH=64; CPPFLAGS="$CPPFLAGS -D_OCC64"; case $platform in Linux*) CPPFLAGS="$CPPFLAGS -m64";; esac], + [AC_MSG_RESULT([yes]); ARCH=64; case $platform in Linux*) CPPFLAGS="$CPPFLAGS -m64";; esac], [AC_MSG_RESULT([no]); ARCH=32;] ) AC_SUBST(ARCH) diff --git a/src/WOKTclLib/templates/template.vc10 b/src/WOKTclLib/templates/template.vc10 index ac48e3e..82ad917 100644 --- a/src/WOKTclLib/templates/template.vc10 +++ b/src/WOKTclLib/templates/template.vc10 @@ -171,7 +171,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -186,7 +186,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -214,7 +214,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc10\objd\__TKNAM__/ @@ -230,7 +230,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc10x b/src/WOKTclLib/templates/template.vc10x index b71cd7e..ab041e6 100644 --- a/src/WOKTclLib/templates/template.vc10x +++ b/src/WOKTclLib/templates/template.vc10x @@ -169,7 +169,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -184,7 +184,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -211,7 +211,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc10\objd\__XQTNAM__/ @@ -227,7 +227,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc11 b/src/WOKTclLib/templates/template.vc11 index 4f2d7ac..b1e68a7 100644 --- a/src/WOKTclLib/templates/template.vc11 +++ b/src/WOKTclLib/templates/template.vc11 @@ -173,7 +173,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -188,7 +188,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -216,7 +216,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc11\objd\__TKNAM__/ @@ -232,7 +232,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc11x b/src/WOKTclLib/templates/template.vc11x index 8ec22d2..a5547ae 100644 --- a/src/WOKTclLib/templates/template.vc11x +++ b/src/WOKTclLib/templates/template.vc11x @@ -169,7 +169,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -183,7 +183,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -210,7 +210,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc11\objd\__XQTNAM__/ @@ -225,7 +225,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc12 b/src/WOKTclLib/templates/template.vc12 index 316d4a5..d29d149 100644 --- a/src/WOKTclLib/templates/template.vc12 +++ b/src/WOKTclLib/templates/template.vc12 @@ -173,7 +173,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -188,7 +188,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -216,7 +216,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc12\objd\__TKNAM__/ @@ -232,7 +232,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc12x b/src/WOKTclLib/templates/template.vc12x index c4a1f2d..2a1a4f7 100644 --- a/src/WOKTclLib/templates/template.vc12x +++ b/src/WOKTclLib/templates/template.vc12x @@ -169,7 +169,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -183,7 +183,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -210,7 +210,7 @@ true Disabled OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\vc12\objd\__XQTNAM__/ @@ -225,7 +225,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) diff --git a/src/WOKTclLib/templates/template.vc8 b/src/WOKTclLib/templates/template.vc8 index b4d03f7..ca5bd7f 100644 --- a/src/WOKTclLib/templates/template.vc8 +++ b/src/WOKTclLib/templates/template.vc8 @@ -251,7 +251,7 @@ AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="2" @@ -271,7 +271,7 @@