[Boost-commit] svn:boost r69080 - in trunk/libs/icl/test: . test_casual_

Subject: [Boost-commit] svn:boost r69080 - in trunk/libs/icl/test: . test_casual_
From: afojgo_at_[hidden]
Date: 2011-02-20 11:37:30

Author: jofaber
Date: 2011-02-20 11:37:27 EST (Sun, 20 Feb 2011)
New Revision: 69080
URL: http://svn.boost.org/trac/boost/changeset/69080

Log:
Fixed std/boost::is_same ambiguity.
Text files modified: 
   trunk/libs/icl/test/test_casual_/test_casual.cpp |    37 +++----------------------------------   
   trunk/libs/icl/test/test_interval_map_shared.hpp |     2 +-                                      
   2 files changed, 4 insertions(+), 35 deletions(-)

Modified: trunk/libs/icl/test/test_casual_/test_casual.cpp
==============================================================================
--- trunk/libs/icl/test/test_casual_/test_casual.cpp	(original)
+++ trunk/libs/icl/test/test_casual_/test_casual.cpp	2011-02-20 11:37:27 EST (Sun, 20 Feb 2011)
@@ -37,9 +37,9 @@
 
     typedef size_type_of<interval<float>::type>::type itv_float_size_type;
 
-    BOOST_CHECK( (is_same<size_type_of<interval<float>::type>::type, std::size_t>::value) );
-    BOOST_CHECK( (is_same<itv_float_size_type, std::size_t>::value) );
-    BOOST_CHECK( (is_same<itv_float_size_type, unsigned int>::value) );
+    BOOST_CHECK( (boost::is_same<size_type_of<interval<float>::type>::type, std::size_t>::value) );
+    BOOST_CHECK( (boost::is_same<itv_float_size_type, std::size_t>::value) );
+    BOOST_CHECK( (boost::is_same<itv_float_size_type, unsigned int>::value) );
 
     cout << cardinality(interval<float>::closed(1,5))  << endl;
     cout << icl::infinity<size_type_of<interval<float>::type>::type>::value() << endl;
@@ -54,21 +54,6 @@
     BOOST_CHECK_EQUAL(true, true);
 }
 
-BOOST_AUTO_TEST_CASE(lower_empty)
-{
-
-{
-  icl::interval_set<int> iclset;
-  iclset += interval<int>::right_open(1,5);
-  icl::interval_set<int> one;
-  one += 1;
-  BOOST_CHECK(icl::intersects( iclset, one ));
-  BOOST_CHECK(!icl::disjoint( iclset, one ));
-}
-
-    BOOST_CHECK_EQUAL(true, true);
-}
-
 BOOST_AUTO_TEST_CASE(casual)
 {
     //typedef int T;
@@ -77,22 +62,6 @@
     //typedef interval_set<T>                   IntervalSetT;
     //typedef IntervalMapT::interval_type       IntervalT;
 
-
-    interval_set<int> iclset;
-    interval<int>::type itv;
-    BOOST_CHECK(is_interval_container<interval_set<int> >::value);
-    BOOST_CHECK((is_same<int, typename domain_type_of<interval_set<int> >::type >::value));
-
-    icl::contains(iclset, 1);
-    icl::within(1, iclset);
-
-    icl::intersects(iclset, 1);
-    icl::intersects(iclset, itv);
-
-    icl::disjoint(iclset, 1);
-    icl::disjoint(iclset, itv);
-
-
     BOOST_CHECK_EQUAL(true, true);
 }
 

Modified: trunk/libs/icl/test/test_interval_map_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_map_shared.hpp	(original)
+++ trunk/libs/icl/test/test_interval_map_shared.hpp	2011-02-20 11:37:27 EST (Sun, 20 Feb 2011)
@@ -1334,7 +1334,7 @@
 
     BOOST_CHECK( icl::is_interval_container<IntervalMapT>::value );
     BOOST_CHECK( icl::has_domain_type<IntervalMapT>::value );
-    BOOST_CHECK( (is_same<T, typename domain_type_of<IntervalMapT>::type>::value) );
+    BOOST_CHECK( (boost::is_same<T, typename domain_type_of<IntervalMapT>::type>::value) );
 
     BOOST_CHECK( icl::intersects(map_a,  MK_v(2) ) );
     BOOST_CHECK( icl::intersects(map_a,  MK_v(11)) );