Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of some windows preprocessor warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1315 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2015-07-24 13:19:40 +00:00
parent f0c20b4493
commit 305aa1b244
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View File

@@ -114,7 +114,7 @@ public:
typedef Decimater::ModNormalFlippingT< mesh_t >::Handle mod_nf_t; typedef Decimater::ModNormalFlippingT< mesh_t >::Handle mod_nf_t;
// object types // object types
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
typedef std::unique_ptr< decimater_t > decimater_o; typedef std::unique_ptr< decimater_t > decimater_o;
#else #else
typedef std::auto_ptr< decimater_t > decimater_o; typedef std::auto_ptr< decimater_t > decimater_o;

2
src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
View File

@@ -131,7 +131,7 @@ public:
bool bind( osg::GeometryPtr geo ) 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); std::unique_ptr<mesh_t> obj(new mesh_t);
#else #else
std::auto_ptr<mesh_t> obj(new mesh_t); std::auto_ptr<mesh_t> obj(new mesh_t);

4
src/OpenMesh/Core/Utils/PropertyManager.hh
View File

@@ -76,7 +76,7 @@ namespace OpenMesh {
*/ */
template<typename PROPTYPE, typename MeshT> template<typename PROPTYPE, typename MeshT>
class PropertyManager { class PropertyManager {
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
public: public:
PropertyManager(const PropertyManager&) = delete; PropertyManager(const PropertyManager&) = delete;
PropertyManager& operator=(const PropertyManager&) = delete; PropertyManager& operator=(const PropertyManager&) = delete;
@@ -148,7 +148,7 @@ class PropertyManager {
MeshT &getMesh() const { return *mesh_; } 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. /// Only for pre C++11 compatibility.
typedef PropertyManager<PROPTYPE, MeshT> Proxy; typedef PropertyManager<PROPTYPE, MeshT> Proxy;

2
src/Unittests/unittests_cpp_11_features.cc
View File

@@ -53,7 +53,7 @@ class OpenMesh_Triangle : public OpenMeshBase {
* ==================================================================== * ====================================================================
*/ */
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/* /*
*/ */