Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
d62d4ffa
Commit
d62d4ffa
authored
Apr 26, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'VisualStudio2013C++11Features' into 'master'
Visual Studio 2013 C++11 Features See merge request
!130
parents
705e1395
45f3b818
Pipeline
#4834
passed with stage
in 84 minutes and 40 seconds
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
24 additions
and
24 deletions
+24
-24
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
+1
-1
src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
+1
-1
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
+1
-1
src/OpenMesh/Core/Mesh/IteratorsT.hh
src/OpenMesh/Core/Mesh/IteratorsT.hh
+1
-1
src/OpenMesh/Core/System/config.h
src/OpenMesh/Core/System/config.h
+1
-1
src/OpenMesh/Core/System/mostream.hh
src/OpenMesh/Core/System/mostream.hh
+4
-4
src/OpenMesh/Core/Utils/PropertyContainer.hh
src/OpenMesh/Core/Utils/PropertyContainer.hh
+1
-1
src/OpenMesh/Core/Utils/PropertyManager.hh
src/OpenMesh/Core/Utils/PropertyManager.hh
+3
-3
src/OpenMesh/Tools/Decimater/DecimaterT.cc
src/OpenMesh/Tools/Decimater/DecimaterT.cc
+3
-3
src/OpenMesh/Tools/Decimater/DecimaterT.hh
src/OpenMesh/Tools/Decimater/DecimaterT.hh
+1
-1
src/OpenMesh/Tools/Utils/HeapT.hh
src/OpenMesh/Tools/Utils/HeapT.hh
+2
-2
src/OpenMesh/Tools/VDPM/ViewingParameters.cc
src/OpenMesh/Tools/VDPM/ViewingParameters.cc
+1
-1
src/Python/Vector.hh
src/Python/Vector.hh
+1
-1
src/Unittests/unittests_cpp_11_features.cc
src/Unittests/unittests_cpp_11_features.cc
+1
-1
src/Unittests/unittests_propertymanager.cc
src/Unittests/unittests_propertymanager.cc
+2
-2
No files found.
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View file @
d62d4ffa
...
...
@@ -114,7 +114,7 @@ public:
typedef
Decimater
::
ModNormalFlippingT
<
mesh_t
>::
Handle
mod_nf_t
;
// object types
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
typedef
std
::
unique_ptr
<
decimater_t
>
decimater_o
;
#else
typedef
std
::
auto_ptr
<
decimater_t
>
decimater_o
;
...
...
src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
View file @
d62d4ffa
...
...
@@ -131,7 +131,7 @@ public:
bool
bind
(
osg
::
GeometryPtr
geo
)
{
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
std
::
unique_ptr
<
mesh_t
>
obj
(
new
mesh_t
);
#else
std
::
auto_ptr
<
mesh_t
>
obj
(
new
mesh_t
);
...
...
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
View file @
d62d4ffa
...
...
@@ -851,7 +851,7 @@ compute_screen_space_error(VHierarchyNodeHandle node_handle, VHierarchyNodeHandl
Vec3f
residual
;
Vec3f
res
;
Vec3f
lp
;
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
900)) )
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
800)) )
// Workaround for internal compiler error
Vec3f
tri
[
3
]{
{},{},{}
};
#else
...
...
src/OpenMesh/Core/Mesh/IteratorsT.hh
View file @
d62d4ffa
...
...
@@ -170,7 +170,7 @@ class GenericIteratorT {
return
cpy
;
}
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
template
<
class
T
=
value_handle
>
auto
operator
+=
(
int
amount
)
->
typename
std
::
enable_if
<
...
...
src/OpenMesh/Core/System/config.h
View file @
d62d4ffa
...
...
@@ -102,7 +102,7 @@
typedef
unsigned
int
uint
;
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__))
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__))
#define OM_HAS_HASH
#endif
...
...
src/OpenMesh/Core/System/mostream.hh
View file @
d62d4ffa
...
...
@@ -70,7 +70,7 @@
#include <string>
#include <algorithm>
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#include <mutex>
#endif
...
...
@@ -189,7 +189,7 @@ protected:
virtual
int
sync
()
{
// If working on multiple threads, we need to serialize the output correctly (requires c++11 headers)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std
::
lock_guard
<
std
::
mutex
>
lck
(
serializer_
);
#endif
...
...
@@ -214,7 +214,7 @@ protected:
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 (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
{
std
::
lock_guard
<
std
::
mutex
>
lck
(
serializer_
);
buffer_
.
push_back
(
c
);
...
...
@@ -264,7 +264,7 @@ private:
bool
enabled_
;
// If working on multiple threads, we need to serialize the output correctly (requires c++11 headers)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std
::
mutex
serializer_
;
#endif
...
...
src/OpenMesh/Core/Utils/PropertyContainer.hh
View file @
d62d4ffa
...
...
@@ -204,7 +204,7 @@ public:
* In C++11 an beyond we can introduce more efficient and more legible
* implementations of the following methods.
*/
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
/**
* Reserves space for \p _n elements in all property vectors.
*/
...
...
src/OpenMesh/Core/Utils/PropertyManager.hh
View file @
d62d4ffa
...
...
@@ -92,7 +92,7 @@ namespace OpenMesh {
*/
template
<
typename
PROPTYPE
,
typename
MeshT
>
class
PropertyManager
{
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
public:
PropertyManager
(
const
PropertyManager
&
)
=
delete
;
PropertyManager
&
operator
=
(
const
PropertyManager
&
)
=
delete
;
...
...
@@ -167,7 +167,7 @@ class PropertyManager {
MeshT
&
getMesh
()
const
{
return
*
mesh_
;
}
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/// Only for pre C++11 compatibility.
typedef
PropertyManager
<
PROPTYPE
,
MeshT
>
Proxy
;
...
...
@@ -410,7 +410,7 @@ class PropertyManager {
(
*
this
)[
*
begin
]
=
value
;
}
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
template
<
typename
HandleTypeIteratorRange
,
typename
PROP_VALUE
>
void
set_range
(
const
HandleTypeIteratorRange
&
range
,
const
PROP_VALUE
&
value
)
{
...
...
src/OpenMesh/Tools/Decimater/DecimaterT.cc
View file @
d62d4ffa
...
...
@@ -78,7 +78,7 @@ template<class Mesh>
DecimaterT
<
Mesh
>::
DecimaterT
(
Mesh
&
_mesh
)
:
BaseDecimaterT
<
Mesh
>
(
_mesh
),
mesh_
(
_mesh
),
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_
(
nullptr
)
#else
heap_
(
NULL
)
...
...
@@ -178,7 +178,7 @@ size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) {
// initialize heap
HeapInterface
HI
(
mesh_
,
priority_
,
heap_position_
);
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_
=
std
::
unique_ptr
<
DeciHeap
>
(
new
DeciHeap
(
HI
));
#else
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) {
// initialize heap
HeapInterface
HI
(
mesh_
,
priority_
,
heap_position_
);
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
heap_
=
std
::
unique_ptr
<
DeciHeap
>
(
new
DeciHeap
(
HI
));
#else
heap_
=
std
::
auto_ptr
<
DeciHeap
>
(
new
DeciHeap
(
HI
));
...
...
src/OpenMesh/Tools/Decimater/DecimaterT.hh
View file @
d62d4ffa
...
...
@@ -195,7 +195,7 @@ private: //------------------------------------------------------- private data
Mesh
&
mesh_
;
// heap
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ )
std
::
unique_ptr
<
DeciHeap
>
heap_
;
#else
std
::
auto_ptr
<
DeciHeap
>
heap_
;
...
...
src/OpenMesh/Tools/Utils/HeapT.hh
View file @
d62d4ffa
...
...
@@ -79,7 +79,7 @@
#include "Config.hh"
#include <vector>
#include <OpenMesh/Core/System/omstream.hh>
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <utility>
#endif
...
...
@@ -150,7 +150,7 @@ public:
/// Constructor
HeapT
()
:
HeapVector
()
{}
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/// Construct with a given \c HeapIterface.
HeapT
(
HeapInterface
_interface
)
:
HeapVector
(),
interface_
(
std
::
move
(
_interface
))
...
...
src/OpenMesh/Tools/VDPM/ViewingParameters.cc
View file @
d62d4ffa
...
...
@@ -92,7 +92,7 @@ update_viewing_configurations()
Vec3f
trans
;
// Workaround for internal compiler error on Visual Studio 2015 Update 1
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) )
#if ((defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) )
Vec3f
inv_rot
[
3
]{
{},{},{}
};
Vec3f
normal
[
4
]{
{},{},{},{}
};
#else
...
...
src/Python/Vector.hh
View file @
d62d4ffa
...
...
@@ -123,7 +123,7 @@ void expose_vec(const char *_name) {
Vector
&
(
Vector
::*
normalize
)(
void
)
=
&
Vector
::
normalize
;
Vector
&
(
Vector
::*
normalize_cond
)(
void
)
=
&
Vector
::
normalize_cond
;
#if (_MSC_VER >= 1
9
00 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
#if (_MSC_VER >= 1
8
00 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
Vector
(
Vector
::*
normalized
)()
const
=
&
Vector
::
normalized
;
#else
const
Vector
(
Vector
::*
normalized
)()
const
=
&
Vector
::
normalized
;
...
...
src/Unittests/unittests_cpp_11_features.cc
View file @
d62d4ffa
...
...
@@ -53,7 +53,7 @@ class OpenMesh_Triangle : public OpenMeshBase {
* ====================================================================
*/
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/*
*/
...
...
src/Unittests/unittests_propertymanager.cc
View file @
d62d4ffa
...
...
@@ -93,7 +93,7 @@ TEST_F(OpenMeshPropertyManager, set_range_bool) {
ASSERT_TRUE
(
pm_f_bool
[
*
f_it
]);
}
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/*
* Same thing again, this time with C++11 ranges.
*/
...
...
@@ -137,7 +137,7 @@ TEST_F(OpenMeshPropertyManager, set_range_bool) {
* C++11 Specific Tests
* ====================================================================
*/
#if (defined(_MSC_VER) && (_MSC_VER >= 1
9
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if (defined(_MSC_VER) && (_MSC_VER >= 1
8
00)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)
template
<
typename
PropHandle
,
typename
Mesh
>
bool
has_property
(
const
Mesh
&
_mesh
,
const
std
::
string
&
_name
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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