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

Merge branch 'warning' into 'master'

Fix undefined MSVC macro warning



See merge request !80
parents 1a96ae05 fc309bd6
Pipeline #2429 failed with stage
in 55 minutes and 16 seconds
...@@ -9,6 +9,16 @@ ...@@ -9,6 +9,16 @@
<tr valign=top><td><b>6.3</b> (?/?/?)</td><td> <tr valign=top><td><b>6.3</b> (?/?/?)</td><td>
<b>General</b>
<ul>
<li>Fixed undefined MSVC macro warning (Thanks to Xan for the patch)</li>
</li>
<b>Build System</b>
<ul>
<li>Removed unnecessary include dir from Core Cmakelist (Thanks to Xan for the patch)</li>
</ul>
</tr> </tr>
<tr valign=top><td><b>6.2</b> (2016/07/11)</td><td> <tr valign=top><td><b>6.2</b> (2016/07/11)</td><td>
......
...@@ -114,7 +114,7 @@ public: ...@@ -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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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;
......
...@@ -131,7 +131,7 @@ public: ...@@ -131,7 +131,7 @@ public:
bool bind( osg::GeometryPtr geo ) bool bind( osg::GeometryPtr geo )
{ {
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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);
......
...@@ -851,7 +851,7 @@ compute_screen_space_error(VHierarchyNodeHandle node_handle, VHierarchyNodeHandl ...@@ -851,7 +851,7 @@ compute_screen_space_error(VHierarchyNodeHandle node_handle, VHierarchyNodeHandl
Vec3f residual; Vec3f residual;
Vec3f res; Vec3f res;
Vec3f lp; Vec3f lp;
#if (_MSC_VER >= 1900 ) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) )
// Workaround for internal compiler error // Workaround for internal compiler error
Vec3f tri[3]{ {},{},{} }; Vec3f tri[3]{ {},{},{} };
#else #else
......
...@@ -3,7 +3,6 @@ include (ACGCommon) ...@@ -3,7 +3,6 @@ include (ACGCommon)
include_directories ( include_directories (
../.. ../..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src
) )
# source code directories # source code directories
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
// macro expansion and preprocessor defines // macro expansion and preprocessor defines
// don't work properly. // don't work properly.
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
#include "Vector11T.hh" #include "Vector11T.hh"
#else #else
#ifndef DOXYGEN #ifndef DOXYGEN
......
...@@ -170,7 +170,7 @@ class GenericIteratorT { ...@@ -170,7 +170,7 @@ class GenericIteratorT {
return cpy; return cpy;
} }
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
template<class T = value_handle> template<class T = value_handle>
auto operator+=(int amount) -> auto operator+=(int amount) ->
typename std::enable_if< typename std::enable_if<
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
typedef unsigned int uint; typedef unsigned int uint;
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__))
#define OM_HAS_HASH #define OM_HAS_HASH
#endif #endif
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#include <mutex> #include <mutex>
#endif #endif
...@@ -189,7 +189,7 @@ protected: ...@@ -189,7 +189,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std::lock_guard<std::mutex> lck (serializer_); std::lock_guard<std::mutex> lck (serializer_);
#endif #endif
...@@ -214,7 +214,7 @@ protected: ...@@ -214,7 +214,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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);
...@@ -264,7 +264,7 @@ private: ...@@ -264,7 +264,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std::mutex serializer_; std::mutex serializer_;
#endif #endif
......
...@@ -204,7 +204,7 @@ public: ...@@ -204,7 +204,7 @@ public:
* In C++11 an beyond we can introduce more efficient and more legible * In C++11 an beyond we can introduce more efficient and more legible
* implementations of the following methods. * implementations of the following methods.
*/ */
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
/** /**
* Reserves space for \p _n elements in all property vectors. * Reserves space for \p _n elements in all property vectors.
*/ */
......
...@@ -92,7 +92,7 @@ namespace OpenMesh { ...@@ -92,7 +92,7 @@ namespace OpenMesh {
*/ */
template<typename PROPTYPE, typename MeshT> template<typename PROPTYPE, typename MeshT>
class PropertyManager { class PropertyManager {
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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;
...@@ -167,7 +167,7 @@ class PropertyManager { ...@@ -167,7 +167,7 @@ class PropertyManager {
MeshT &getMesh() const { return *mesh_; } MeshT &getMesh() const { return *mesh_; }
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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;
......
...@@ -78,7 +78,7 @@ template<class Mesh> ...@@ -78,7 +78,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_(nullptr) heap_(nullptr)
#else #else
heap_(NULL) heap_(NULL)
...@@ -178,7 +178,7 @@ size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) { ...@@ -178,7 +178,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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));
...@@ -282,7 +282,7 @@ size_t DecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) { ...@@ -282,7 +282,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 _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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));
......
...@@ -195,7 +195,7 @@ private: //------------------------------------------------------- private data ...@@ -195,7 +195,7 @@ private: //------------------------------------------------------- private data
Mesh& mesh_; Mesh& mesh_;
// heap // heap
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __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_;
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
#include "Config.hh" #include "Config.hh"
#include <vector> #include <vector>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <utility> #include <utility>
#endif #endif
...@@ -150,7 +150,7 @@ public: ...@@ -150,7 +150,7 @@ public:
/// Constructor /// Constructor
HeapT() : HeapVector() {} HeapT() : HeapVector() {}
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/// Construct with a given \c HeapIterface. /// Construct with a given \c HeapIterface.
HeapT(HeapInterface _interface) HeapT(HeapInterface _interface)
: HeapVector(), interface_(std::move(_interface)) : HeapVector(), interface_(std::move(_interface))
......
...@@ -92,7 +92,7 @@ update_viewing_configurations() ...@@ -92,7 +92,7 @@ update_viewing_configurations()
Vec3f trans; Vec3f trans;
// Workaround for internal compiler error on Visual Studio 2015 Update 1 // Workaround for internal compiler error on Visual Studio 2015 Update 1
#if (_MSC_VER >= 1900 ) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) )
Vec3f inv_rot[3]{ {},{},{} }; Vec3f inv_rot[3]{ {},{},{} };
Vec3f normal[4]{ {},{},{},{} }; Vec3f normal[4]{ {},{},{},{} };
#else #else
......
...@@ -78,7 +78,7 @@ void defInitMod(class_< OpenMesh::VectorT<Scalar, 3> > &classVector) { ...@@ -78,7 +78,7 @@ void defInitMod(class_< OpenMesh::VectorT<Scalar, 3> > &classVector) {
classVector classVector
.def("__init__", make_constructor(&Factory<Scalar>::vec3_default)) .def("__init__", make_constructor(&Factory<Scalar>::vec3_default))
.def("__init__", make_constructor(&Factory<Scalar>::vec3_user_defined)) .def("__init__", make_constructor(&Factory<Scalar>::vec3_user_defined))
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
.def("__mod__", &Factory<Scalar>::Vector3::template operator%<Scalar>) .def("__mod__", &Factory<Scalar>::Vector3::template operator%<Scalar>)
; ;
def("cross", &Factory<Scalar>::Vector3::template operator%<Scalar>); def("cross", &Factory<Scalar>::Vector3::template operator%<Scalar>);
...@@ -144,7 +144,7 @@ void expose_vec(const char *_name) { ...@@ -144,7 +144,7 @@ void expose_vec(const char *_name) {
.def("vectorize", &Vector::vectorize, return_internal_reference<>()) .def("vectorize", &Vector::vectorize, return_internal_reference<>())
.def(self < self) .def(self < self)
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
.def("dot", &Vector::template operator|<Scalar>) .def("dot", &Vector::template operator|<Scalar>)
.def("norm", &Vector::template norm<Scalar>) .def("norm", &Vector::template norm<Scalar>)
.def("length", &Vector::template length<Scalar>) .def("length", &Vector::template length<Scalar>)
......
...@@ -53,7 +53,7 @@ class OpenMesh_Triangle : public OpenMeshBase { ...@@ -53,7 +53,7 @@ class OpenMesh_Triangle : public OpenMeshBase {
* ==================================================================== * ====================================================================
*/ */
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/* /*
*/ */
......
...@@ -97,7 +97,7 @@ TEST_F(OpenMeshPropertyManager, set_range_bool) { ...@@ -97,7 +97,7 @@ TEST_F(OpenMeshPropertyManager, set_range_bool) {
* C++11 Specific Tests * C++11 Specific Tests
* ==================================================================== * ====================================================================
*/ */
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
template<typename PropHandle, typename Mesh> template<typename PropHandle, typename Mesh>
bool has_property(const Mesh& _mesh, const std::string& _name) { bool has_property(const Mesh& _mesh, const std::string& _name) {
......
...@@ -84,7 +84,7 @@ TEST_F(OpenMeshVectorTest, VectorCasting) { ...@@ -84,7 +84,7 @@ TEST_F(OpenMeshVectorTest, VectorCasting) {
} }
#if _MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
TEST_F(OpenMeshVectorTest, cpp11_constructors) { TEST_F(OpenMeshVectorTest, cpp11_constructors) {
OpenMesh::Vec3d vec1 { 1.2, 2.0, 3.0 }; OpenMesh::Vec3d vec1 { 1.2, 2.0, 3.0 };
......
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