Commit 859345eb by Max Lyon

Merge branch 'rangeiter-msvc' into 'master'

enable ```__cplusplus>=201103``` guarded code on recent MSVC.

See merge request !19
parents a45f4a3d 7c0a3bd0
Pipeline #4803 passed with stage
in 7 minutes 47 seconds
...@@ -131,7 +131,7 @@ private: ...@@ -131,7 +131,7 @@ private:
}; };
#if __cplusplus >= 201103L #if __cplusplus >= 201103L || _MSC_VER >= 1800 // an older MSVC version might be sufficient, didn't test
#include <type_traits> #include <type_traits>
......
...@@ -53,7 +53,7 @@ TEST_F(TetrahedralMeshBase, VertexVertexIteratorTest) { ...@@ -53,7 +53,7 @@ TEST_F(TetrahedralMeshBase, VertexVertexIteratorTest) {
} }
#if __cplusplus >= 201103L // C++11 #if __cplusplus >= 201103L || _MSC_VER >= 1800 // C++11
{ {
std::set<VertexHandle> onering; std::set<VertexHandle> onering;
...@@ -110,7 +110,7 @@ TEST_F(TetrahedralMeshBase, VertexFaceIteratorTest) { ...@@ -110,7 +110,7 @@ TEST_F(TetrahedralMeshBase, VertexFaceIteratorTest) {
} }
#if __cplusplus >= 201103L // C++11 #if __cplusplus >= 201103L || _MSC_VER >= 1800 // C++11
{ {
std::set<VertexHandle> onering; std::set<VertexHandle> onering;
...@@ -136,7 +136,7 @@ TEST_F(TetrahedralMeshBase, VertexFaceIteratorTest) { ...@@ -136,7 +136,7 @@ TEST_F(TetrahedralMeshBase, VertexFaceIteratorTest) {
} }
#if __cplusplus >= 201103L // C++11 #if __cplusplus >= 201103L || _MSC_VER >= 1800 // C++11
TEST_F(HexahedralMeshBase, RangeForTest) { TEST_F(HexahedralMeshBase, RangeForTest) {
// no EXPECTs here, if it compiles, it'll work. // no EXPECTs here, if it compiles, it'll work.
generateHexahedralMesh(mesh_); generateHexahedralMesh(mesh_);
......
#include <gtest/gtest.h> #include <gtest/gtest.h>
#if __cplusplus >= 201103L #if __cplusplus >= 201103L || _MSC_VER >= 1800
#include <OpenVolumeMesh/System/MemoryInclude.hh> #include <OpenVolumeMesh/System/MemoryInclude.hh>
......
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 sign in to comment