Changeset 9757

Timestamp:

02/10/09 21:31:50 (4 years ago)

Author:

robert

Message:

Merged warning fix from OSG-2.8 branch:

svn merge -r 9755:9756 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/cfg/ConfigParser.cpp (modified) (1 diff)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -34 +34 @@
 # set to 0 when not a release candidate, non zero means that any generated 
 # svn tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})

OpenSceneGraph/trunk/src/osgPlugins/cfg/ConfigParser.cpp

@@ -2262 +2262 @@
             else
             */
-            execlp( cpp_path, "cpp",  "-P", fileName.c_str(), NULL );
+            execlp( cpp_path, "cpp",  "-P", fileName.c_str(), (char *)NULL );
 
             // This should not execute unless an error happens