From 5709f808d1a3cf0960cccd4c91a2ffde44a5867b Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 28 Feb 2017 10:14:41 +0000 Subject: Move -DBOOST_ALL_DYN_LINK from persistence to global CMakeLists.txt (also required by witness) Add CGAL and Eigen3 required by Witness in main page Add examples to be tested for Witness git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2115 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 33fbdf3e970c35635ae2738c1ace801f077ec750 --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1346f5d9..a71ad829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,8 @@ else() add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) # BOOST ISSUE with Libraries name resolution under Windows add_definitions(-DBOOST_ALL_NO_LIB) + # problem with Visual Studio link on Boost program_options + add_definitions( -DBOOST_ALL_DYN_LINK ) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) -- cgit v1.2.3 From 28783add0035c46efa2754038d55f8a31ca93526 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 2 Mar 2017 13:14:45 +0000 Subject: Add Boost system libraries for examples using persistence Remove useless includes in example_nearest_landmark_table.cpp Fix list iterator not dereferencable on example nearest_landmark_table git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2126 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c93f00a0892737e1324a3ee8378ef7d49e6517d4 --- CMakeLists.txt | 2 +- src/Witness_complex/example/example_nearest_landmark_table.cpp | 2 -- src/Witness_complex/include/gudhi/Witness_complex.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a71ad829..07992ba1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ else() # Turn off some VC++ warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic -fsanitize=address -fno-omit-frame-pointer") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/src/Witness_complex/example/example_nearest_landmark_table.cpp b/src/Witness_complex/example/example_nearest_landmark_table.cpp index 65b675f9..b8594212 100644 --- a/src/Witness_complex/example/example_nearest_landmark_table.cpp +++ b/src/Witness_complex/example/example_nearest_landmark_table.cpp @@ -28,11 +28,9 @@ #include #include -#include #include #include #include -#include int main(int argc, char * const argv[]) { using Nearest_landmark_range = std::vector>; diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index a79bf294..edd5c0a8 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -160,7 +160,7 @@ class Witness_complex { bool will_be_active = false; typename ActiveWitness::iterator l_it = curr_l; if (dim > 0) { - for (; l_it->second - alpha2 <= norelax_dist2 && l_it != end; ++l_it) { + for (; l_it != end && l_it->second - alpha2 <= norelax_dist2; ++l_it) { simplex.push_back(l_it->first); if (sc.find(simplex) != sc.null_simplex()) { typename ActiveWitness::iterator next_it = l_it; -- cgit v1.2.3 From 5b2ac6a04b3b0f03570e5d00a94d8e1871d36a95 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 2 Mar 2017 14:19:08 +0000 Subject: Remove clang sanitizer options git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2129 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 07ba9d5ca3e7fca2a352cfe90447fbc46c33811d --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 07992ba1..a71ad829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ else() # Turn off some VC++ warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic -fsanitize=address -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) -- cgit v1.2.3