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

Don't use BOOST_MULTI_INDEX_MEMBER

This commit is contained in:
Andreas Fabri 2013-02-14 12:09:18 +01:00
parent 9d3755c11c
commit ae3602cb5d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h
View File

@ -80,13 +80,17 @@ public:
//! hashed map data type //! hashed map data type
typedef std::pair<Key_type, Value_type> Data_type; typedef std::pair<Key_type, Value_type> Data_type;
// try boost::identity ?
// We don't use BOOST_MULTI_INDEX_MEMBER but ::boost::multi_index::member_offset
// because VC10 had a problem with it
//
// An independent remark: try boost::identity ?
typedef boost::multi_index::multi_index_container< typedef boost::multi_index::multi_index_container<
Data_type, Data_type,
boost::multi_index::indexed_by< boost::multi_index::indexed_by<
boost::multi_index::sequenced<>, boost::multi_index::sequenced<>,
boost::multi_index::hashed_unique< boost::multi_index::hashed_unique<
BOOST_MULTI_INDEX_MEMBER(Data_type, Key_type, first), ::boost::multi_index::member_offset<Data_type,Key_type,offsetof(Data_type,first)>,
Hash, Pred > > > Hashed_map; Hash, Pred > > > Hashed_map;

6
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
View File

@ -167,6 +167,12 @@ run_test()
rm -f $OUTPUTFILE rm -f $OUTPUTFILE
COMMAND="./$1" COMMAND="./$1"
echo "Executing $1 $5 $6 ... " echo "Executing $1 $5 $6 ... "
echo $COMMAND
echo $2
echo $3
echo $4
echo $5
echo $6
if eval $COMMAND $2 $3 $4 $5 $6 > $OUTPUTFILE 2>&1 ; then if eval $COMMAND $2 $3 $4 $5 $6 > $OUTPUTFILE 2>&1 ; then
echo " successful execution of $5 $6" >> $ERRORFILE echo " successful execution of $5 $6" >> $ERRORFILE
else else