songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unconditionally disable NO_TR1 defines. 

Those cause trouble, because on MSVC the include paths for tr1
components are different from gcc. Instead of fixing up the include
paths depending on platform, just never use a tr1 component. Nothing
of value is lost compared to the boost equivalents and it removes
another code-path.
This commit is contained in:
Philipp Möller 2012-09-28 13:15:14 +00:00
parent 177fa5f3ed
commit ab5c017c08
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/include/CGAL/config.h
View File

@ -111,12 +111,10 @@
#if defined(BOOST_NO_VARIADIC_TEMPLATES)
#define CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES 1
#endif
#if !defined(BOOST_HAS_TR1_ARRAY)
// never use TR1
#define CGAL_CFG_NO_TR1_ARRAY 1
#endif
#if !defined(BOOST_HAS_TR1_TUPLE)
// never use TR1
#define CGAL_CFG_NO_TR1_TUPLE 1
#endif
#if !defined(__GNUC__)
#define CGAL_CFG_NO_STATEMENT_EXPRESSIONS 1
#endif

4
STL_Extension/include/CGAL/array.h
View File

@ -23,8 +23,6 @@
#include <CGAL/config.h>
#ifndef CGAL_CFG_NO_CPP0X_ARRAY
# include <array>
#elif !defined CGAL_CFG_NO_TR1_ARRAY
# include <tr1/array>
#else
# include <boost/array.hpp>
#endif
@ -35,8 +33,6 @@ namespace cpp11 {
#ifndef CGAL_CFG_NO_CPP0X_ARRAY
using std::array;
#elif !defined CGAL_CFG_NO_TR1_ARRAY
using std::tr1::array;
#else
using boost::array;
#endif

23
STL_Extension/include/CGAL/tuple.h
View File

@ -27,15 +27,11 @@
#ifndef CGAL_CFG_NO_CPP0X_TUPLE
# include <tuple>
#else
# include <boost/tuple/tuple.hpp>
# include <boost/tuple/tuple_comparison.hpp>
# include <utility>
#endif
#ifndef CGAL_CFG_NO_TR1_TUPLE
# include <tr1/tuple>
# include <tr1/utility>
#endif
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
#include <utility>
namespace CGAL {
@ -48,13 +44,6 @@ using std::tie;
using std::get;
using std::tuple_size;
using std::tuple_element;
#elif !defined CGAL_CFG_NO_TR1_TUPLE
using std::tr1::tuple;
using std::tr1::make_tuple;
using std::tr1::tie;
using std::tr1::get;
using std::tr1::tuple_size;
using std::tr1::tuple_element;
#else
using boost::tuple;
using boost::make_tuple;
@ -72,8 +61,8 @@ struct tuple_element: public boost::tuples::element<N,T>{};
#endif
#if defined(CGAL_CFG_NO_CPP0X_TUPLE) && defined(CGAL_CFG_NO_TR1_TUPLE)
// If not TR1 or C++11 tuple, we need to add get<N>(std::pair).
#if defined(CGAL_CFG_NO_CPP0X_TUPLE)
// If not C++11 tuple, we need to add get<N>(std::pair).
////////////////////////////////////////////////////////////
// //