[Boost-commit] svn:boost r66799 - trunk/libs/icl/test

Subject: [Boost-commit] svn:boost r66799 - trunk/libs/icl/test
From: afojgo_at_[hidden]
Date: 2010-11-27 13:29:48

Author: jofaber
Date: 2010-11-27 13:29:46 EST (Sat, 27 Nov 2010)
New Revision: 66799
URL: http://svn.boost.org/trac/boost/changeset/66799

Log:
Adjustments for stlport-5.2 on VeecoFTC.
Text files modified: 
   trunk/libs/icl/test/test_interval_map_mixed.hpp  |     6 +++---                                  
   trunk/libs/icl/test/test_interval_map_shared.hpp |    16 +++++++---------                        
   trunk/libs/icl/test/test_interval_set_mixed.hpp  |     6 +++---                                  
   trunk/libs/icl/test/test_interval_set_shared.hpp |    12 ++++++------                            
   4 files changed, 19 insertions(+), 21 deletions(-)

Modified: trunk/libs/icl/test/test_interval_map_mixed.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_map_mixed.hpp	(original)
+++ trunk/libs/icl/test/test_interval_map_mixed.hpp	2010-11-27 13:29:46 EST (Sat, 27 Nov 2010)
@@ -19,7 +19,7 @@
     typedef interval_map<T,U>       IntervalMapT;
     typedef split_interval_map<T,U> SplitIntervalMapT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     U u1 = unit_element<U>::value();
 
     SplitIntervalMapT split_map(make_pair(v0,u1));
@@ -36,7 +36,7 @@
     typedef split_interval_map<T,U> SplitIntervalMapT;
     typedef typename IntervalMapT::interval_type IntervalT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     U u1 = unit_element<U>::value();
 
     SplitIntervalMapT    split_empty, split_single(make_pair(v0,u1));
@@ -81,7 +81,7 @@
     typedef split_interval_map<T,U> SplitIntervalMapT;
     typedef typename IntervalMapT::interval_type IntervalT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     T v1 = unit_element<T>::value();
     U u1 = unit_element<U>::value();
 

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	2010-11-27 13:29:46 EST (Sat, 27 Nov 2010)
@@ -24,9 +24,7 @@
     // we are able to test operations only for the most basic values
     // identity_element (0, empty, T() ...) and unit_element.
 
-    //T v0 = identity_element<T>();
-    //T v1 = unit_element<T>();
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     T v1 = unit_element<T>::value();
     IntervalT I0_0I(v0);
     IntervalT I1_1I(v1);
@@ -38,18 +36,18 @@
     //-------------------------------------------------------------------------
     BOOST_CHECK_EQUAL(IntervalMapT().empty(), true);
     BOOST_CHECK_EQUAL(icl::is_empty(IntervalMapT()), true);
-    BOOST_CHECK_EQUAL(cardinality(IntervalMapT()), identity_element<size_T>::value());
-    BOOST_CHECK_EQUAL(IntervalMapT().size(), identity_element<size_T>::value());
-    BOOST_CHECK_EQUAL(icl::size(IntervalMapT()), identity_element<size_T>::value());
+    BOOST_CHECK_EQUAL(cardinality(IntervalMapT()), boost::icl::identity_element<size_T>::value());
+    BOOST_CHECK_EQUAL(IntervalMapT().size(), boost::icl::identity_element<size_T>::value());
+    BOOST_CHECK_EQUAL(icl::size(IntervalMapT()), boost::icl::identity_element<size_T>::value());
     BOOST_CHECK_EQUAL(interval_count(IntervalMapT()), 0);
     BOOST_CHECK_EQUAL(IntervalMapT().iterative_size(), 0);
     BOOST_CHECK_EQUAL(iterative_size(IntervalMapT()), 0);
     BOOST_CHECK_EQUAL(IntervalMapT(), IntervalMapT());
 
-    IntervalT mt_interval = identity_element<IntervalT >::value();
+    IntervalT mt_interval = boost::icl::identity_element<IntervalT >::value();
     BOOST_CHECK_EQUAL(mt_interval, IntervalT());
     typename IntervalMapT::value_type mt_u1 = make_pair(mt_interval, u1);
-    IntervalMapT mt_map = identity_element<IntervalMapT >::value();
+    IntervalMapT mt_map = boost::icl::identity_element<IntervalMapT >::value();
     BOOST_CHECK_EQUAL(mt_map, IntervalMapT());
 
     //adding emptieness to emptieness yields emptieness ;)
@@ -59,7 +57,7 @@
     BOOST_CHECK_EQUAL(mt_map, IntervalMapT());
     (mt_map += mt_u1) += mt_u1;
     BOOST_CHECK_EQUAL(mt_map, IntervalMapT());
-    BOOST_CHECK_EQUAL(hull(mt_map), identity_element<IntervalT >::value());
+    BOOST_CHECK_EQUAL(hull(mt_map), boost::icl::identity_element<IntervalT >::value());
 
     //subtracting emptieness
     mt_map.subtract(mt_u1).subtract(mt_u1);

Modified: trunk/libs/icl/test/test_interval_set_mixed.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_set_mixed.hpp	(original)
+++ trunk/libs/icl/test/test_interval_set_mixed.hpp	2010-11-27 13:29:46 EST (Sat, 27 Nov 2010)
@@ -14,7 +14,7 @@
     typedef interval_set<T> IntervalSetT;
     typedef typename IntervalSetT::interval_type IntervalT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     
     split_interval_set<T>    split_set(v0);
     separate_interval_set<T> sep_set(split_set);
@@ -30,7 +30,7 @@
     typedef interval_set<T> IntervalSetT;
     typedef typename IntervalSetT::interval_type IntervalT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     
     split_interval_set<T>    split_empty, split_single(v0);
     separate_interval_set<T> sep_empty, sep_single(v0);
@@ -97,7 +97,7 @@
     typedef interval_set<T> IntervalSetT;
     typedef typename IntervalSetT::interval_type IntervalT;
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     T v1 = unit_element<T>::value();
 
     split_interval_set<T>    split_set;

Modified: trunk/libs/icl/test/test_interval_set_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_set_shared.hpp	(original)
+++ trunk/libs/icl/test/test_interval_set_shared.hpp	2010-11-27 13:29:46 EST (Sat, 27 Nov 2010)
@@ -23,7 +23,7 @@
     // we are able to test operations only for the most basic values
     // identity_element (0, empty, T() ...) and unit_element.
 
-    T v0 = identity_element<T>::value();
+    T v0 = boost::icl::identity_element<T>::value();
     T v1 = unit_element<T>::value();
     IntervalT I0_0I(v0);
     IntervalT I1_1I(v1);
@@ -34,16 +34,16 @@
     //-------------------------------------------------------------------------
     BOOST_CHECK_EQUAL(IntervalSet<T>().empty(), true);
     BOOST_CHECK_EQUAL(icl::is_empty(IntervalSet<T>()), true);
-    BOOST_CHECK_EQUAL(cardinality(IntervalSet<T>()), identity_element<size_T>::value());
-    BOOST_CHECK_EQUAL(IntervalSet<T>().size(), identity_element<size_T>::value());
+    BOOST_CHECK_EQUAL(cardinality(IntervalSet<T>()), boost::icl::identity_element<size_T>::value());
+    BOOST_CHECK_EQUAL(IntervalSet<T>().size(), boost::icl::identity_element<size_T>::value());
     BOOST_CHECK_EQUAL(interval_count(IntervalSet<T>()), 0);
     BOOST_CHECK_EQUAL(IntervalSet<T>().iterative_size(), 0);
     BOOST_CHECK_EQUAL(iterative_size(IntervalSet<T>()), 0);
     BOOST_CHECK_EQUAL(IntervalSet<T>(), IntervalSet<T>());
 
-    IntervalT mt_interval = identity_element<IntervalT>::value();
+    IntervalT mt_interval = boost::icl::identity_element<IntervalT>::value();
     BOOST_CHECK_EQUAL(mt_interval, IntervalT());
-    IntervalSet<T> mt_set = identity_element<IntervalSet<T> >::value();
+    IntervalSet<T> mt_set = boost::icl::identity_element<IntervalSet<T> >::value();
     BOOST_CHECK_EQUAL(mt_set, IntervalSet<T>());
 
     //adding emptieness to emptieness yields emptieness ;)
@@ -53,7 +53,7 @@
     BOOST_CHECK_EQUAL(mt_set, IntervalSet<T>());
     (mt_set += mt_interval) += mt_interval;
     BOOST_CHECK_EQUAL(mt_set, IntervalSet<T>());
-    BOOST_CHECK_EQUAL(hull(mt_set), identity_element<IntervalT >::value());
+    BOOST_CHECK_EQUAL(hull(mt_set), boost::icl::identity_element<IntervalT >::value());
 
     //subtracting emptieness
     mt_set.subtract(mt_interval).subtract(mt_interval);