Commit 305aa1b2 authored by Jan Möbius's avatar Jan Möbius
Browse files

Get rid of some windows preprocessor warnings

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1315 fdac6126-5c0c-442c-9429-916003d36597
parent f0c20b44
......@@ -114,7 +114,7 @@ public:
typedef Decimater::ModNormalFlippingT< mesh_t >::Handle mod_nf_t;
// object types
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__
#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
typedef std::unique_ptr< decimater_t > decimater_o;
#else
typedef std::auto_ptr< decimater_t > decimater_o;
......
......@@ -131,7 +131,7 @@ public:
bool bind( osg::GeometryPtr geo )
{
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__
#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
std::unique_ptr<mesh_t> obj(new mesh_t);
#else
std::auto_ptr<mesh_t> obj(new mesh_t);
......
......@@ -76,7 +76,7 @@ namespace OpenMesh {
*/
template<typename PROPTYPE, typename MeshT>
class PropertyManager {
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__
#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
public:
PropertyManager(const PropertyManager&) = delete;
PropertyManager& operator=(const PropertyManager&) = delete;
......@@ -148,7 +148,7 @@ class PropertyManager {
MeshT &getMesh() const { return *mesh_; }
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__
#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/// Only for pre C++11 compatibility.
typedef PropertyManager<PROPTYPE, MeshT> Proxy;
......
......@@ -53,7 +53,7 @@ class OpenMesh_Triangle : public OpenMeshBase {
* ====================================================================
*/
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__
#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/*
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment