[Boost-commit] svn:boost r82287 - in trunk/libs/icl/test: . ex_boost_party_

Subject: [Boost-commit] svn:boost r82287 - in trunk/libs/icl/test: . ex_boost_party_
From: afojgo_at_[hidden]
Date: 2012-12-30 17:16:02

Author: jofaber
Date: 2012-12-30 17:16:00 EST (Sun, 30 Dec 2012)
New Revision: 82287
URL: http://svn.boost.org/trac/boost/changeset/82287

Log:
Adjustments of test code for clang.
Text files modified: 
   trunk/libs/icl/test/ex_boost_party_/ex_boost_party.cpp |     4 ++--                                    
   trunk/libs/icl/test/test_interval_map_mixed.hpp        |    10 +++++++---                              
   2 files changed, 9 insertions(+), 5 deletions(-)

Modified: trunk/libs/icl/test/ex_boost_party_/ex_boost_party.cpp
==============================================================================
--- trunk/libs/icl/test/ex_boost_party_/ex_boost_party.cpp	(original)
+++ trunk/libs/icl/test/ex_boost_party_/ex_boost_party.cpp	2012-12-30 17:16:00 EST (Sun, 30 Dec 2012)
@@ -9,8 +9,8 @@
 
 #include <libs/icl/test/disable_test_warnings.hpp>
 #include "../unit_test_unwarned.hpp"
-#include <boost/icl/set.hpp> // Needed for implicit calls of operator << on
-                             // GuestSets via test macros.
+//#include <boost/icl/set.hpp> // Needed for implicit calls of operator << on
+//JODO CLANG                   // GuestSets via test macros.
 
 //------------------------------------------------------------------------------
 // begin example code. return value added to function boost_party

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	2012-12-30 17:16:00 EST (Sun, 30 Dec 2012)
@@ -22,7 +22,9 @@
     T v0 = boost::icl::identity_element<T>::value();
     U u1 = unit_element<U>::value();
 
-    SplitIntervalMapT split_map(make_pair(v0,u1));
+    SplitIntervalMapT split_map(mapping_pair<T,U>(v0,u1));
+    //JODO: clang err: ctor ambiguous. Should compile 
+    //JODO CLANG SplitIntervalMapT split_map(make_pair(v0,u1));
     IntervalMapT      join_map(split_map);
 
     BOOST_CHECK_EQUAL( hull(split_map).lower(), hull(join_map).lower() );
@@ -39,8 +41,10 @@
     T v0 = boost::icl::identity_element<T>::value();
     U u1 = unit_element<U>::value();
 
-    SplitIntervalMapT    split_empty, split_single(make_pair(v0,u1));
-    IntervalMapT         join_empty, join_single(make_pair(v0,u1));
+    SplitIntervalMapT    split_empty, split_single(mapping_pair<T,U>(v0,u1));
+    IntervalMapT         join_empty, join_single(mapping_pair<T,U>(v0,u1));
+    //JODO CLANG SplitIntervalMapT    split_empty, split_single(make_pair(v0,u1));
+    //JODO CLANG IntervalMapT         join_empty, join_single(make_pair(v0,u1));
 
     // mixed ==-equality is a strange thing. Most times is does not
     // make sense. It is better to allow only for same type == equality.