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

Subject: [Boost-commit] svn:boost r66692 - in trunk: boost/icl libs/icl/test
From: afojgo_at_[hidden]
Date: 2010-11-22 17:35:35

Author: jofaber
Date: 2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
New Revision: 66692
URL: http://svn.boost.org/trac/boost/changeset/66692

Log:
Excluded some tests for msvc-7.1 to circumvent a mysterious linker error that occurs for msvc-7.1 only.
Text files modified: 
   trunk/boost/icl/interval_base_map.hpp                   |     2 +-                                      
   trunk/libs/icl/test/test_icl_quantifier_shared.hpp      |     4 ++++                                    
   trunk/libs/icl/test/test_interval_quantifier_shared.hpp |     4 ++++                                    
   trunk/libs/icl/test/test_interval_set_laws_shared.hpp   |     4 ++++                                    
   trunk/libs/icl/test/test_quantifier_icl_map.hpp         |     4 ++++                                    
   trunk/libs/icl/test/test_quantifier_map_shared.hpp      |     4 ++++                                    
   trunk/libs/icl/test/test_value_maker.hpp                |     3 ++-                                     
   7 files changed, 23 insertions(+), 2 deletions(-)

Modified: trunk/boost/icl/interval_base_map.hpp
==============================================================================
--- trunk/boost/icl/interval_base_map.hpp	(original)
+++ trunk/boost/icl/interval_base_map.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -673,7 +673,7 @@
     template<class Type>
     struct on_total_absorbable<Type, true, true>
     {
-        static void flip(Type& object, const typename Type::segment_type& operand)
+        static void flip(Type& object, const typename Type::segment_type&)
         { icl::clear(object); }
     };
 

Modified: trunk/libs/icl/test/test_icl_quantifier_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_icl_quantifier_shared.hpp	(original)
+++ trunk/libs/icl/test/test_icl_quantifier_shared.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -169,8 +169,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus)(map_a, map_b, map_c, map_pair_a, map_pair_b);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe)(map_a, map_b, map_c, map_pair_a, map_pair_b);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(plus)(is_distinct_equal, map_a, map_b, map_c, map_pair_a, map_pair_b);
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(pipe)(is_distinct_equal, map_a, map_b, map_c, map_pair_a, map_pair_b);
+#endif
 }
 
 
@@ -212,8 +214,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus) (map_a, map_b, map_c, map_pair_a, map_pair_b);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe) (map_a, map_b, map_c, map_pair_a, map_pair_b);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(plus) (is_distinct_equal, map_a, map_b, map_c, map_pair_a, map_pair_b);
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(pipe) (is_distinct_equal, map_a, map_b, map_c, map_pair_a, map_pair_b);
+#endif
 }
 
 //------------------------------------------------------------------------------

Modified: trunk/libs/icl/test/test_interval_quantifier_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_quantifier_shared.hpp	(original)
+++ trunk/libs/icl/test/test_interval_quantifier_shared.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -129,8 +129,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus)(map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe)(map_a, map_b, map_c, val_pair, map_pair);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(plus)(is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(pipe)(is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
+#endif
 }
 
 
@@ -170,8 +172,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus) (map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe) (map_a, map_b, map_c, val_pair, map_pair);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(plus) (is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(pipe) (is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
+#endif
 }
 
 

Modified: trunk/libs/icl/test/test_interval_set_laws_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_set_laws_shared.hpp	(original)
+++ trunk/libs/icl/test/test_interval_set_laws_shared.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -126,8 +126,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus)(set_a, set_b, set_c, segm, elem);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe)(set_a, set_b, set_c, segm, elem);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(plus)(is_distinct_equal, set_a, set_b, set_c, segm, elem);
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(pipe)(is_distinct_equal, set_a, set_b, set_c, segm, elem);
+#endif
 }
 
 
@@ -170,8 +172,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus) (set_a, set_b, set_c, segm, elem);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe) (set_a, set_b, set_c, segm, elem);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(plus) (is_distinct_equal, set_a, set_b, set_c, segm, elem);
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(pipe) (is_distinct_equal, set_a, set_b, set_c, segm, elem);
+#endif
 }
 
 #endif // LIBS_ICL_TEST_TEST_INTERVAL_SET_LAWS_SHARED_HPP_JOFA_090201

Modified: trunk/libs/icl/test/test_quantifier_icl_map.hpp
==============================================================================
--- trunk/libs/icl/test/test_quantifier_icl_map.hpp	(original)
+++ trunk/libs/icl/test/test_quantifier_icl_map.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -168,8 +168,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus)(map_a, map_b, map_c, map_pair1, map_pair2);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe)(map_a, map_b, map_c, map_pair1, map_pair2);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(plus)(is_distinct_equal, map_a, map_b, map_c, map_pair1, map_pair2);
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(pipe)(is_distinct_equal, map_a, map_b, map_c, map_pair1, map_pair2);
+#endif
 }
 
 
@@ -226,8 +228,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus) (map_a, map_b, map_c, map_pair1, map_pair2);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe) (map_a, map_b, map_c, map_pair1, map_pair2);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(plus) (is_distinct_equal, map_a, map_b, map_c, map_pair1, map_pair2);
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(pipe) (is_distinct_equal, map_a, map_b, map_c, map_pair1, map_pair2);
+#endif
 }
 
 #endif // LIBS_ICL_TEST_TEST_QUANTIFIER_ICL_MAP_HPP_JOFA_090119

Modified: trunk/libs/icl/test/test_quantifier_map_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_quantifier_map_shared.hpp	(original)
+++ trunk/libs/icl/test/test_quantifier_map_shared.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -132,8 +132,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus)(map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe)(map_a, map_b, map_c, val_pair, map_pair);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(plus)(is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
     CHECK_PARTIAL_INVERTIVE_MONOID_INSTANCE_WRT_EQUAL(pipe)(is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
+#endif
 }
 
 
@@ -178,8 +180,10 @@
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(plus) (map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_MONOID_INSTANCE_WRT(pipe) (map_a, map_b, map_c, val_pair, map_pair);
 
+#if !defined(_MSC_VER) || (_MSC_VER >= 1400) // 1310==MSVC-7.1  1400 ==MSVC-8.0
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(plus) (is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
     CHECK_ABELIAN_GROUP_INSTANCE_WRT_EQUAL(pipe) (is_distinct_equal, map_a, map_b, map_c, val_pair, map_pair);
+#endif
 }
 
 #endif // LIBS_ICL_TEST_TEST_QUANTIFIER_MAP_SHARED_HPP_JOFA_090119

Modified: trunk/libs/icl/test/test_value_maker.hpp
==============================================================================
--- trunk/libs/icl/test/test_value_maker.hpp	(original)
+++ trunk/libs/icl/test/test_value_maker.hpp	2010-11-22 17:35:29 EST (Mon, 22 Nov 2010)
@@ -108,7 +108,8 @@
     static interval_type interval_(int lower, int upper, int bounds = 2)
     {
         return interval_type(test_value<domain_type>::make(lower), 
-                             test_value<domain_type>::make(upper), interval_bounds(bounds));
+                             test_value<domain_type>::make(upper), 
+                             interval_bounds(static_cast<bound_type>(bounds)));
     }
 
     static segment_type val_pair(int lower, int upper, int val, int bounds = 2)