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

Merge branch 'master' into persistent_edge_properties

Browse Source
This commit is contained in:
Max Lyon
2018-10-12 15:16:52 +02:00
parent 8ce8d8a623 8c6cb2b64c
commit e618a5e48d
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CI/Windows.bat
View File

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

6
Doc/changelog.docu
View File

@@ -25,6 +25,12 @@
<li>SmartTagger: Added the SmartTagger class to tag primitives (O(1) reset )</li> <li>SmartTagger: Added the SmartTagger class to tag primitives (O(1) reset )</li>
</ul> </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> </tr>

12
src/OpenMesh/Core/Mesh/CirculatorsT.hh
View File

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

4
src/OpenMesh/Core/Mesh/IteratorsT.hh
View File

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

10
src/OpenMesh/Core/System/config.h
View File

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