Show
Ignore:
Timestamp:
03/22/10 15:55:52 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/typedefs.h

    r10012 r11274  
    1313#define MESH_TYPEDEFS_H 
    1414 
    15 #   ifdef WIN32 
     15#   if defined(_MSC_VER) 
    1616#      include <Winsock2.h> 
    1717#      include <Windows.h> 
     
    1919 
    2020#   include <osg/Notify> 
    21 #    include <cassert> 
    22 #   define MESHASSERT  assert 
     21 
     22#ifdef NDEBUG 
     23#   define MESHASSERT( x ) 
     24#else 
     25#    define MESHASSERT(x) { if( !(x) )                                      \ 
     26              osg::notify(osg::WARN) << "Ply Loader ##### Assert: " << #x << " #####" << std::endl; } 
     27#endif 
     28 
    2329#   define MESHERROR   osg::notify(osg::WARN) 
    2430#   define MESHWARN    osg::notify(osg::WARN) 
    2531#   define MESHINFO    osg::notify(osg::INFO) 
    2632 
    27 #ifdef WIN32 
     33#if defined(_MSC_VER) 
    2834typedef int        socklen_t; 
    2935 
     
    3844#    endif 
    3945 
    40 #endif // Win32 
     46#endif // defined(_MSC_VER) 
    4147 
    4248#include <exception>