From a8cdc7ca4ab97c466e2a20fd1df5e46346d5289b Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Wed, 24 Sep 2008 09:13:57 +0000
Subject: [PATCH] Remove Boost.Bimap FEATURE: it is now hard-coded that bimap
 is supported iff boost version is >= 1.35

---
 .gitattributes                                |  1 -
 Installation/config/support/S07-BOOST_BIMAP   | 21 ---------
 .../config/support/test_BOOST_BIMAP.cpp       | 45 -------------------
 Mesh_2/include/CGAL/Double_map.h              |  5 +++
 4 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 Installation/config/support/S07-BOOST_BIMAP
 delete mode 100644 Installation/config/support/test_BOOST_BIMAP.cpp

diff --git a/.gitattributes b/.gitattributes
index 4cb6679acee..7ee9d9a5496 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1672,7 +1672,6 @@ Installation/config/support/S05-BOOST -text
 Installation/config/support/S06a-BOOST_PROGRAM_OPTIONS -text
 Installation/config/support/S06b-MS_BOOST_PROGRAM_OPTIONS -text
 Installation/config/support/S06c-BOOST_PROGRAM_OPTIONS_GCC -text
-Installation/config/support/S07-BOOST_BIMAP -text
 Installation/config/support/S08a-BOOST_THREAD -text
 Installation/config/support/S08b-MS_BOOST_THREAD -text
 Installation/config/support/S08c-BOOST_THREAD_GCC -text
diff --git a/Installation/config/support/S07-BOOST_BIMAP b/Installation/config/support/S07-BOOST_BIMAP
deleted file mode 100644
index 01af289daad..00000000000
--- a/Installation/config/support/S07-BOOST_BIMAP
+++ /dev/null
@@ -1,21 +0,0 @@
-# The Boost.Bimap library
-# http://cablemodem.fibertel.com.ar/mcape/boost/libs/bimap/index.html
-#
-# To be included in Boost:
-# http://lists.boost.org/Archives/boost/2007/03/117351.php
-
-
-DESCRIPTION = Boost.Bimap library
-PROVIDES = BOOST_BIMAP
-CXXFLAGS = 
-LDFLAGS = 
-LIBS = 
-REQUIRES = BOOST
-INCOMPATIBLE = 
-STDINCLDIRS = /usr/include/\*
-INCLTHING = boost/bimap/bimap.hpp
-STDLIBDIRS = 
-LIBTHING = 
-COMPILETESTFLAGS = 
-
-# EOF
diff --git a/Installation/config/support/test_BOOST_BIMAP.cpp b/Installation/config/support/test_BOOST_BIMAP.cpp
deleted file mode 100644
index 49a9ee964b5..00000000000
--- a/Installation/config/support/test_BOOST_BIMAP.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2007  INRIA Sophia Antipolis (France)
-// All rights reserved.
-//
-// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation; version 2.1 of the License.
-// See the file LICENSE.LGPL distributed with CGAL.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// $URL$
-// $Id$
-// 
-//
-// Author(s)     : Laurent Rineau
-
-// Tests if Boost.Bimap is available.
-
-#include <iostream>
-#include <boost/bimap/bimap.hpp>
-#include <boost/bimap/set_of.hpp>
-
-using boost::bimap::bimap;
-using boost::bimap::set_of;
-
-int main()
-{
-  bimap<set_of<int,    std::less<int>    >,
-        set_of<double, std::less<double> >
-    > function;
-
-  function.left[1] = 2.;
-
-  if( function.right[2.] == 1 )
-  {
-    std::cout << "ok for Boost.Bimap\n";
-    return 0;
-  }
-  else
-    return 1;
-}
diff --git a/Mesh_2/include/CGAL/Double_map.h b/Mesh_2/include/CGAL/Double_map.h
index a9eb0c9145b..8bfa21321b4 100644
--- a/Mesh_2/include/CGAL/Double_map.h
+++ b/Mesh_2/include/CGAL/Double_map.h
@@ -26,6 +26,11 @@
 #include <CGAL/assertions.h>
 #include <CGAL/function_objects.h> // for CGAL::Identity
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 103500
+#  define CGAL_USE_BOOST_BIMAP
+#endif
+
 #ifdef CGAL_USE_BOOST_BIMAP
 #include <boost/bimap.hpp>
 #include <boost/bimap/multiset_of.hpp>