From dc8a8693966e8a6db45b0d9f142d3ff8e3da7c7f Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 19 Dec 2017 21:06:34 +0000
Subject: Boost minimal version is 1.48.0 (modification rollback) - if
 boost_version use static_vector (from Boost 1.54.0)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3090 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 487d902c645793f2647191a0d8f9218184fa19de
---
 src/Alpha_complex/utilities/alpha_complex_3d_persistence.cpp | 9 +++++++++
 src/cmake/modules/GUDHI_third_party_libraries.cmake          | 2 +-
 src/common/doc/main_page.h                                   | 2 +-
 src/cython/doc/installation.rst                              | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Alpha_complex/utilities/alpha_complex_3d_persistence.cpp b/src/Alpha_complex/utilities/alpha_complex_3d_persistence.cpp
index f4a14ae3..1070d17b 100644
--- a/src/Alpha_complex/utilities/alpha_complex_3d_persistence.cpp
+++ b/src/Alpha_complex/utilities/alpha_complex_3d_persistence.cpp
@@ -20,9 +20,13 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boost/version.hpp>
 #include <boost/program_options.hpp>
 #include <boost/variant.hpp>
+
+#if BOOST_VERSION >= 105400
 #include <boost/container/static_vector.hpp>
+#endif
 
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Persistent_cohomology.h>
@@ -66,7 +70,12 @@ using Cell_handle = Alpha_shape_3::Cell_handle;
 using Facet = Alpha_shape_3::Facet;
 using Edge_3 = Alpha_shape_3::Edge;
 using Vertex_handle = Alpha_shape_3::Vertex_handle;
+
+#if BOOST_VERSION >= 105400
 using Vertex_list = boost::container::static_vector<Alpha_shape_3::Vertex_handle, 4>;
+#else
+using Vertex_list = std::vector<Alpha_shape_3::Vertex_handle>;
+#endif
 
 // gudhi type definition
 using ST = Gudhi::Simplex_tree<Gudhi::Simplex_tree_options_fast_persistence>;
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 7696496c..84545f18 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -1,6 +1,6 @@
 # This files manage third party libraries required by GUDHI
 
-find_package(Boost 1.56.0 REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread)
+find_package(Boost 1.48.0 REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread)
 
 if(NOT Boost_FOUND)
   message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.")
diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h
index 7ba8a4b7..148ee670 100644
--- a/src/common/doc/main_page.h
+++ b/src/common/doc/main_page.h
@@ -258,7 +258,7 @@
  * Examples of GUDHI headers inclusion can be found in \ref demos.
  * 
  * \section compiling Compiling
- * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> with version 1.56.0 or
+ * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> with version 1.48.0 or
  * more recent. It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015.
  * 
  * \subsection demos Demos and examples
diff --git a/src/cython/doc/installation.rst b/src/cython/doc/installation.rst
index 2f689497..c182f176 100644
--- a/src/cython/doc/installation.rst
+++ b/src/cython/doc/installation.rst
@@ -5,7 +5,7 @@ Compiling
 *********
 
 The library uses c++11 and requires `Boost <http://www.boost.org/>`_ with
-version 1.56.0 or more recent. It is a multi-platform library and compiles on
+version 1.48.0 or more recent. It is a multi-platform library and compiles on
 Linux, Mac OSX and Visual Studio 2015.
 It also requires cmake to generate makefiles, and cython to compile the
 library.
-- 
cgit v1.2.3