diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-06 11:07:32 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-06 11:07:32 +0000 |
commit | c78af8d62f026bf08958bd06678b71ce338a51e7 (patch) | |
tree | cfcad519395f4cac9edc929c778edae256f1c282 /src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp | |
parent | a1d8a8b08002d7d2067b76b7109cae4c20618540 (diff) | |
parent | e5a99b635c16cf63d50b29c716f38250f35e363b (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1653 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3f11061ff76ea31b08bf6560a19e94fb3546f0f8
Diffstat (limited to 'src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp')
-rw-r--r-- | src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp b/src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp index 7b303935..4f9888ba 100644 --- a/src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp +++ b/src/Skeleton_blocker/test/test_skeleton_blocker_complex.cpp @@ -358,7 +358,8 @@ BOOST_AUTO_TEST_CASE(test_skeleton_iterator_blockers) { num_blockers = 0; for (auto blockers : complex.blocker_range()) { -#ifndef _WIN64 +// If not windows - _WIN32 is for windows 32 and 64 bits +#ifndef _WIN32 for (auto block_ptr = myBlockers.begin(); block_ptr < myBlockers.end(); block_ptr++) if (*block_ptr == *blockers) myBlockers.erase(block_ptr); @@ -366,7 +367,8 @@ BOOST_AUTO_TEST_CASE(test_skeleton_iterator_blockers) { num_blockers++; } BOOST_CHECK(num_blockers == 4); -#ifndef _WIN64 +// If not windows - _WIN32 is for windows 32 and 64 bits +#ifndef _WIN32 BOOST_CHECK(myBlockers.empty()); #endif } |