Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
e618a5e4
Commit
e618a5e4
authored
Oct 12, 2018
by
Max Lyon
Browse files
Merge branch 'master' into persistent_edge_properties
parents
8ce8d8a6
8c6cb2b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
CI/Windows.bat
View file @
e618a5e4
...
...
@@ -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
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013_64
_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013_64
_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013_64
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013
_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013
_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013
set
QT_BASE_CONFIG
=
-DQT
5
_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
View file @
e618a5e4
...
...
@@ -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
View file @
e618a5e4
...
...
@@ -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
View file @
e618a5e4
...
...
@@ -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
View file @
e618a5e4
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment