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

fix windows warning about unknown preprocessor define

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1240 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2015-03-10 17:01:09 +00:00
parent 6b43727a01
commit efa160ccc9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/System/mostream.hh
View File

@@ -63,7 +63,7 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#include <mutex> #include <mutex>
#endif #endif
@@ -182,7 +182,7 @@ protected:
virtual int sync() virtual int sync()
{ {
// If working on multiple threads, we need to serialize the output correctly (requires c++11 headers) // If working on multiple threads, we need to serialize the output correctly (requires c++11 headers)
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std::lock_guard<std::mutex> lck (serializer_); std::lock_guard<std::mutex> lck (serializer_);
#endif #endif
@@ -207,7 +207,7 @@ protected:
char c = traits_type::to_char_type(_c); char c = traits_type::to_char_type(_c);
// If working on multiple threads, we need to serialize the output correctly (requires c++11 headers) // If working on multiple threads, we need to serialize the output correctly (requires c++11 headers)
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
{ {
std::lock_guard<std::mutex> lck (serializer_); std::lock_guard<std::mutex> lck (serializer_);
buffer_.push_back(c); buffer_.push_back(c);
@@ -257,7 +257,7 @@ private:
bool enabled_; bool enabled_;
// If working on multiple threads, we need to serialize the output correctly (requires c++11 headers) // If working on multiple threads, we need to serialize the output correctly (requires c++11 headers)
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std::mutex serializer_; std::mutex serializer_;
#endif #endif

6
src/OpenMesh/Tools/Decimater/DecimaterT.cc
View File

@@ -71,7 +71,7 @@ template<class Mesh>
DecimaterT<Mesh>::DecimaterT(Mesh& _mesh) : DecimaterT<Mesh>::DecimaterT(Mesh& _mesh) :
BaseDecimaterT<Mesh>(_mesh), BaseDecimaterT<Mesh>(_mesh),
mesh_(_mesh), mesh_(_mesh),
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_(nullptr) heap_(nullptr)
#else #else
heap_(NULL) heap_(NULL)
@@ -171,7 +171,7 @@ size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) {
// initialize heap // initialize heap
HeapInterface HI(mesh_, priority_, heap_position_); HeapInterface HI(mesh_, priority_, heap_position_);
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_ = std::unique_ptr<DeciHeap>(new DeciHeap(HI)); heap_ = std::unique_ptr<DeciHeap>(new DeciHeap(HI));
#else #else
heap_ = std::auto_ptr<DeciHeap>(new DeciHeap(HI)); heap_ = std::auto_ptr<DeciHeap>(new DeciHeap(HI));
@@ -272,7 +272,7 @@ size_t DecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
// initialize heap // initialize heap
HeapInterface HI(mesh_, priority_, heap_position_); HeapInterface HI(mesh_, priority_, heap_position_);
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_ = std::unique_ptr<DeciHeap>(new DeciHeap(HI)); heap_ = std::unique_ptr<DeciHeap>(new DeciHeap(HI));
#else #else
heap_ = std::auto_ptr<DeciHeap>(new DeciHeap(HI)); heap_ = std::auto_ptr<DeciHeap>(new DeciHeap(HI));

2
src/OpenMesh/Tools/Decimater/DecimaterT.hh
View File

@@ -166,7 +166,7 @@ private: //------------------------------------------------------- private data
Mesh& mesh_; Mesh& mesh_;
// heap // heap
#if __cplusplus > 199711L or __GXX_EXPERIMENTAL_CXX0X__ #if __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std::unique_ptr<DeciHeap> heap_; std::unique_ptr<DeciHeap> heap_;
#else #else
std::auto_ptr<DeciHeap> heap_; std::auto_ptr<DeciHeap> heap_;