mirror of https://github.com/CGAL/cgal
Remove Boost.Bimap FEATURE: it is now hard-coded that bimap is supported iff boost version is >= 1.35
This commit is contained in:
parent
936b91e739
commit
a8cdc7ca4a
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue