Changeset 3242

Timestamp:

08/06/04 07:25:21 (9 years ago)

Author:

robert

Message:

From Bruce Clay, Build fixes for Win32 VS6.0

Location:

OpenSceneGraph/trunk

Files:

• examples/osgdem/osgdem.cpp (modified) (1 diff)
• examples/osgpointsprite/osgpointsprite.cpp (modified) (1 diff)
• include/osgTerrain/DataSet (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgdem/osgdem.cpp

@@ -9 +9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
+
+#ifdef WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+// Disable unavoidable warning messages:
+
+//  4114: same type qualifier used more than once
+//  4201: nonstandard extension used : nameless struct/union
+//  4237: "keyword" reserved for future use
+//  4251: class needs to have dll-interface to export class
+//  4275: non DLL-interface class used as base for DLL-interface class
+//  4290: C++ Exception Specification ignored
+//  4503: ecorated name length exceeded, name was truncated
+//  4786: string too long - truncated to 255 characters
+
+//#pragma warning(disable : 4103 4114 4201 4237 4251 4275 4290 4335 4786)
+#pragma warning(disable : 4503)
+
+#endif // WIN32
 
 #include <osg/Texture2D>

OpenSceneGraph/trunk/examples/osgpointsprite/osgpointsprite.cpp

@@ -93 +93 @@
         viewer.frame();
     }
+
+    return(0);
 }
 

OpenSceneGraph/trunk/include/osgTerrain/DataSet

@@ -11 +11 @@
  * OpenSceneGraph Public License for more details.
 */
+
+#ifdef WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+// Disable unavoidable warning messages:
+//
+// C4503 - decorated name length exceeded, name was truncated
+//
+#pragma warning(disable : 4503)
+
+#endif // WIN32
 
 #ifndef DATASET_H