Merge branch 'master' into persistent_edge_properties

CI/Windows.bat

@@ -38,13 +38,13 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
     set GENERATOR=Visual Studio 12%ARCH_VS%
     set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
     IF "%ARCHITECTURE%" == "x64" (
-      set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
+      set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64
+      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64
     )
 
     IF "%ARCHITECTURE%" == "x32" (
-      set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
+      set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013
+      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013
     )
 ) 
 
@@ -98,6 +98,7 @@ IF "%APPS%" == "ON" (
 ECHO "============================================================="
 ECHO "============================================================="
 ECHO "Building with :"
+whoami
 ECHO "ARCHITECTURE        : %ARCHITECTURE%"
 ECHO "BUILD_PLATFORM      : %BUILD_PLATFORM%"
 ECHO "GTESTVERSION        : %GTESTVERSION%"

Doc/changelog.docu

@@ -25,6 +25,12 @@
 <li>SmartTagger: Added the SmartTagger class to tag primitives (O(1) reset )</li>
 </ul>
 
+<b>Build System</b>
+<ul>
+<li>Rename the DEPRECATED macro into OM_DEPRECATED to prevent a macro clash with Intel MKL (Thanks to Morgan Leborgne for the patch)</li>
+</ul>
+
+
 </tr>
 
 

src/OpenMesh/Core/Mesh/CirculatorsT.hh

@@ -470,7 +470,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
     To be save, you can use the CW/CCW circulator definitions, which behave\
     the same as the original ones, without the previously mentioned issues."
 
-        DEPRECATED( DECREMENT_DEPRECATED_WARNINGS_TEXT )
+        OM_DEPRECATED( DECREMENT_DEPRECATED_WARNINGS_TEXT )
 #endif // NO_DECREMENT_DEPRECATED_WARNINGS
         GenericCirculatorT_DEPRECATED& operator--() {
             assert(this->mesh_);
@@ -488,7 +488,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
 
         /// Post-decrement
 #ifndef NO_DECREMENT_DEPRECATED_WARNINGS
-        DEPRECATED( DECREMENT_DEPRECATED_WARNINGS_TEXT )
+        OM_DEPRECATED( DECREMENT_DEPRECATED_WARNINGS_TEXT )
 #undef DECREMENT_DEPRECATED_WARNINGS_TEXT
 #endif //NO_DECREMENT_DEPRECATED_WARNINGS
         GenericCirculatorT_DEPRECATED operator--(int) {
@@ -542,7 +542,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
             return GenericCirculator_ValueHandleFns::is_valid(this->heh_,this->start_, this->lap_counter_);
         }
 
-        DEPRECATED("current_halfedge_handle() is an implementation detail and should not be accessed from outside the iterator class.")
+        OM_DEPRECATED("current_halfedge_handle() is an implementation detail and should not be accessed from outside the iterator class.")
         /**
          * \deprecated
          * current_halfedge_handle() is an implementation detail and should not
@@ -552,7 +552,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
             return this->heh_;
         }
 
-        DEPRECATED("Do not use this error prone implicit cast. Compare to end-iterator or use is_valid(), instead.")
+        OM_DEPRECATED("Do not use this error prone implicit cast. Compare to end-iterator or use is_valid(), instead.")
         /**
          * \deprecated
          * Do not use this error prone implicit cast. Compare to the
@@ -567,7 +567,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
          * \deprecated
          * This function clutters your code. Use dereferencing operators -> and * instead.
          */
-        DEPRECATED("This function clutters your code. Use dereferencing operators -> and * instead.")
+        OM_DEPRECATED("This function clutters your code. Use dereferencing operators -> and * instead.")
         value_type handle() const {
           return **this;
         }
@@ -578,7 +578,7 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<Mesh> {
          * Implicit casts of iterators are unsafe. Use dereferencing operators
          * -> and * instead.
          */
-        DEPRECATED("Implicit casts of iterators are unsafe. Use dereferencing operators -> and * instead.")
+        OM_DEPRECATED("Implicit casts of iterators are unsafe. Use dereferencing operators -> and * instead.")
         operator value_type() const {
           return **this;
         }

src/OpenMesh/Core/Mesh/IteratorsT.hh

@@ -126,7 +126,7 @@ class GenericIteratorT {
          * \deprecated 
          * This function clutters your code. Use dereferencing operators -> and * instead.
          */
-        DEPRECATED("This function clutters your code. Use dereferencing operators -> and * instead.")
+        OM_DEPRECATED("This function clutters your code. Use dereferencing operators -> and * instead.")
         value_handle handle() const {
             return hnd_;
         }
@@ -137,7 +137,7 @@ class GenericIteratorT {
          * Implicit casts of iterators are unsafe. Use dereferencing operators
          * -> and * instead.
          */
-        DEPRECATED("Implicit casts of iterators are unsafe. Use dereferencing operators -> and * instead.")
+        OM_DEPRECATED("Implicit casts of iterators are unsafe. Use dereferencing operators -> and * instead.")
         operator value_handle() const {
             return hnd_;
         }

src/OpenMesh/Core/System/config.h

@@ -83,17 +83,17 @@
 #endif
 
 #if defined(_MSC_VER)
-#  define DEPRECATED(msg) __declspec(deprecated(msg))
+#  define OM_DEPRECATED(msg) __declspec(deprecated(msg))
 #elif defined(__GNUC__)
 #  if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40500 /* Test for GCC >= 4.5.0 */
-#    define DEPRECATED(msg) __attribute__ ((deprecated(msg)))
+#    define OM_DEPRECATED(msg) __attribute__ ((deprecated(msg)))
 #  else
-#    define DEPRECATED(msg) __attribute__ ((deprecated))
+#    define OM_DEPRECATED(msg) __attribute__ ((deprecated))
 #  endif
 #elif defined(__clang__)
-#  define DEPRECATED(msg) __attribute__ ((deprecated(msg)))
+#  define OM_DEPRECATED(msg) __attribute__ ((deprecated(msg)))
 #else
-#  define DEPRECATED(msg)
+#  define OM_DEPRECATED(msg)
 #endif
 
 typedef unsigned int uint;