Changeset 11274 for OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/typedefs.h

Timestamp:

03/22/10 15:55:52 (3 years ago)

Author:

paulmartz

Message:

2.8 branch: Hm, mysteriously, the ply plugin seems to be missing changes that were previously merged. This commit brings them up to date with svn trunk as of r11237.

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/typedefs.h (modified) (3 diffs)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/typedefs.h

@@ -13 +13 @@
 #define MESH_TYPEDEFS_H
 
-#   ifdef WIN32
+#   if defined(_MSC_VER)
 #      include <Winsock2.h>
 #      include <Windows.h>
@@ -19 +19 @@
 
 #   include <osg/Notify>
-#    include <cassert>
-#   define MESHASSERT  assert
+
+#ifdef NDEBUG
+#   define MESHASSERT( x )
+#else
+#    define MESHASSERT(x) { if( !(x) )                                      \
+              osg::notify(osg::WARN) << "Ply Loader ##### Assert: " << #x << " #####" << std::endl; }
+#endif
+
 #   define MESHERROR   osg::notify(osg::WARN)
 #   define MESHWARN    osg::notify(osg::WARN)
 #   define MESHINFO    osg::notify(osg::INFO)
 
-#ifdef WIN32
+#if defined(_MSC_VER)
 typedef int        socklen_t;
 
@@ -38 +44 @@
 #    endif
 
-#endif // Win32
+#endif // defined(_MSC_VER)
 
 #include <exception>