diff options
author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2022-10-18 10:23:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-18 10:23:48 +0200 |
commit | 9d38d47755a47d4e8bcf20833e609544fd406458 (patch) | |
tree | 5edfbfda74be3c4b7cc944c3daf6d71532f45507 /src | |
parent | 524718d63a8f633dbcc4fe7db3fe920ebd7e972c (diff) | |
parent | fd66e103bd7f6fba20f0eb915294dacb15807747 (diff) |
Merge pull request #697 from VincentRouvreau/feature/cpp17
c++17 as a new standard to compile the library
Diffstat (limited to 'src')
-rw-r--r-- | src/Tangential_complex/benchmark/XML_exporter.h | 2 | ||||
-rw-r--r-- | src/cmake/modules/GUDHI_compilation_flags.cmake | 2 | ||||
-rw-r--r-- | src/common/doc/installation.h | 4 | ||||
-rw-r--r-- | src/python/doc/installation.rst | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Tangential_complex/benchmark/XML_exporter.h b/src/Tangential_complex/benchmark/XML_exporter.h index 16b62eb6..38fe049f 100644 --- a/src/Tangential_complex/benchmark/XML_exporter.h +++ b/src/Tangential_complex/benchmark/XML_exporter.h @@ -157,7 +157,7 @@ class Streaming_XML_exporter { m_xml_fstream << " </" << m_element_name << ">" << std::endl; // Save current pointer position - std::ofstream::streampos pos = m_xml_fstream.tellp(); + auto pos = m_xml_fstream.tellp(); // Close the XML file (temporarily) so that the XML file is always correct m_xml_fstream << "</" << m_list_name << ">" << std::endl; // Restore the pointer position so that the next "add_element" will overwrite diff --git a/src/cmake/modules/GUDHI_compilation_flags.cmake b/src/cmake/modules/GUDHI_compilation_flags.cmake index 567fbc40..e2d3d872 100644 --- a/src/cmake/modules/GUDHI_compilation_flags.cmake +++ b/src/cmake/modules/GUDHI_compilation_flags.cmake @@ -11,7 +11,7 @@ macro(add_cxx_compiler_flag _flag) endif() endmacro() -set (CMAKE_CXX_STANDARD 14) +set (CMAKE_CXX_STANDARD 17) enable_testing() diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index 63a37a25..f2f8a476 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -5,9 +5,9 @@ * Examples of GUDHI headers inclusion can be found in \ref utilities. * * \section compiling Compiling - * The library uses c++14 and requires <a target="_blank" href="https://www.boost.org/">Boost</a> ≥ 1.66.0 + * The library uses c++17 and requires <a target="_blank" href="https://www.boost.org/">Boost</a> ≥ 1.66.0 * and <a target="_blank" href="https://cmake.org/">CMake</a> ≥ 3.5. - * It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015. + * It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2017. * * \subsection utilities Utilities and examples * To build the utilities, run the following commands in a terminal: diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst index 4eefd415..b704f778 100644 --- a/src/python/doc/installation.rst +++ b/src/python/doc/installation.rst @@ -39,7 +39,7 @@ If you are instead using a git checkout, beware that the paths are a bit different, and in particular the `python/` subdirectory is actually `src/python/` there. -The library uses c++14 and requires `Boost <https://www.boost.org/>`_ :math:`\geq` 1.66.0, +The library uses c++17 and requires `Boost <https://www.boost.org/>`_ :math:`\geq` 1.66.0, `CMake <https://www.cmake.org/>`_ :math:`\geq` 3.5 to generate makefiles, Python :math:`\geq` 3.5, `NumPy <http://numpy.org>`_ :math:`\geq` 1.15.0, `Cython <https://www.cython.org/>`_ :math:`\geq` 0.27 and `pybind11 <https://github.com/pybind/pybind11>`_ to compile the GUDHI Python module. |