Browse files

fixed: allow core transit ptr assignment

     : include prebuild OSGScanParseSkelParser.hpp in install
     : don't check for secure warning/deprecated defines set 


git-svn-id: https://external.lite3d.com/opensg/svn_repo/trunk@2296 4683daeb-ad0f-0410-a623-93161e962ae5
  • Loading branch information...
1 parent 9ffffde commit 157685afbfda456c7692107dd2c86e0f7253be55 vossg committed Feb 21, 2010
View
8 Source/Base/Base/OSGConfig.h
@@ -1036,6 +1036,7 @@
#if defined(WIN32)
# if defined(OSG_DISABLE_MICROSOFT_SECURE_CXXX)
+# if 0
# if !defined(_CRT_SECURE_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _CRT_SECURE_NO_DEPRECATE not set"
# endif
@@ -1045,21 +1046,25 @@
# if !defined(_CRT_NONSTDC_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _CRT_NONSTDC_NO_DEPRECATE not set"
# endif
+# endif
# if !defined(_SECURE_SCL) || _SECURE_SCL != 0
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _SECURE_SCL not set or not equal 0"
# endif
+# if 0
# if !defined(_SCL_SECURE_NO_WARNINGS)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _SCL_SECURE_NO_WARNINGS not set"
# endif
# if !defined(_SCL_SECURE_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _SCL_SECURE_NO_DEPRECATE not set"
# endif
+# endif
# if !defined(_HAS_ITERATOR_DEBUGGING) || _HAS_ITERATOR_DEBUGGING != 0
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX on, but _HAS_ITERATOR_DEBUGGING not set or not equal 0"
# endif
#else
+# if 0
# if defined(_CRT_SECURE_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _CRT_SECURE_NO_DEPRECATE set"
# endif
@@ -1069,15 +1074,18 @@
# if defined(_CRT_NONSTDC_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _CRT_NONSTDC_NO_DEPRECATE set"
# endif
+# endif
# if defined(_SECURE_SCL) && _SECURE_SCL != 1
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _SECURE_SCL set"
# endif
+# if 0
# if defined(_SCL_SECURE_NO_WARNINGS)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _SCL_SECURE_NO_WARNINGS set"
# endif
# if defined(_SCL_SECURE_NO_DEPRECATE)
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _SCL_SECURE_NO_DEPRECATE set"
# endif
+# endif
# if defined(_HAS_ITERATOR_DEBUGGING) && ((defined(_DEBUG) && _HAS_ITERATOR_DEBUGGING != 1) || (!defined(_DEBUG) && _HAS_ITERATOR_DEBUGGING != 0))
# error "mixed up compiler settings, OpenSG libs with OSG_DISABLE_MICROSOFT_SECURE_CXXX off, but _HAS_ITERATOR_DEBUGGING set"
# endif
View
2 Source/Base/FieldContainer/Node/OSGCoredNodePtr.inl
@@ -251,7 +251,7 @@ template<class CoreT>
inline typename CoredNodeRefPtr<CoreT>::Self &
CoredNodeRefPtr<CoreT>::operator =(CoreTransitPtr pCore)
{
- if(_pCore != pCore)
+ if(pCore != _pCore)
_pCore = pCore;
updateNode();
View
6 Source/System/CMakeLists.Lib.OSGSystem.txt
@@ -110,6 +110,12 @@ IF(${OSG_CMAKE_PASS} STREQUAL "OSGCOLLECT")
\"${CMAKE_SOURCE_DIR}/Source/External/google/sparsehash/densehashtable.h\"
\"${CMAKE_SOURCE_DIR}/Source/External/google/sparsehash/hash_fun.h\"
\"${CMAKE_SOURCE_DIR}/Source/External/google/sparsehash/sparsehashtable.h\")\n\n")
+
+ IF(NOT OSG_ENABLE_SCANPARSE_REGEN)
+ FILE(APPEND ${${PROJECT_NAME}_BUILD_FILE}
+ "LIST(APPEND ${PROJECT_NAME}_HDR
+ \"${CMAKE_SOURCE_DIR}/Source/System/FileIO/ScanParseSkel/prebuild/OSGScanParseSkelParser.hpp\")\n\n")
+ ENDIF(NOT OSG_ENABLE_SCANPARSE_REGEN)
ENDIF(${OSG_CMAKE_PASS} STREQUAL "OSGCOLLECT")

0 comments on commit 157685a

Please sign in to comment.