diff options
| -rw-r--r-- | src/Alpha_shapes/include/gudhi/Alpha_shapes.h | 2 | ||||
| -rw-r--r-- | src/Alpha_shapes/include/gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/Alpha_shapes/include/gudhi/Alpha_shapes.h b/src/Alpha_shapes/include/gudhi/Alpha_shapes.h index deece712..b8efdb4d 100644 --- a/src/Alpha_shapes/include/gudhi/Alpha_shapes.h +++ b/src/Alpha_shapes/include/gudhi/Alpha_shapes.h @@ -171,7 +171,7 @@ class Alpha_shapes { /** \brief Returns the number of simplices in the complex. * * Does not count the empty simplex. */ - const unsigned int num_simplices() const { + const unsigned int& num_simplices() const { return _st.num_simplices(); } diff --git a/src/Alpha_shapes/include/gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h b/src/Alpha_shapes/include/gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h index b38ca4d6..693b393e 100644 --- a/src/Alpha_shapes/include/gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h +++ b/src/Alpha_shapes/include/gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h @@ -190,16 +190,15 @@ class Delaunay_triangulation_off_writer { } // Finite cells list - /*for (auto cit = save_complex.finite_full_cells_begin(); cit != save_complex.finite_full_cells_end(); ++cit) { + for (auto cit = save_complex.finite_full_cells_begin(); cit != save_complex.finite_full_cells_end(); ++cit) { stream << std::distance(cit->vertices_begin(), cit->vertices_end()) << " "; // Dimension for (auto vit = cit->vertices_begin(); vit != cit->vertices_end(); ++vit) { auto vertexHdl = *vit; - std::cout << // auto vertexHdl = std::distance(save_complex.vertices_begin(), *vit) - 1; // stream << std::distance(save_complex.vertices_begin(), *(vit)) - 1 << " "; } stream << std::endl; - }*/ + } stream.close(); } else { std::cerr << "could not open file " << name_file << std::endl; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7869bc4b..3be05c4f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,9 +12,7 @@ endif() if(MSVC) 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} -O2 -std=c++11 -Wall -Wpedantic -Wsign-compare -Werror") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O0") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() set(Boost_USE_STATIC_LIBS ON) |