[Boost-commit] svn:boost r54667 - in sandbox/itl/libs/itl/test: . fastest_interval_map_

Subject: [Boost-commit] svn:boost r54667 - in sandbox/itl/libs/itl/test: . fastest_interval_map_
From: afojgo_at_[hidden]
Date: 2009-07-05 04:32:43

Author: jofaber
Date: 2009-07-05 04:32:42 EDT (Sun, 05 Jul 2009)
New Revision: 54667
URL: http://svn.boost.org/trac/boost/changeset/54667

Log:
Fixed some compile errors detected by gcc-4.3.2: Shadowed template
params.

Text files modified: 
   sandbox/itl/libs/itl/test/fastest_interval_map_/fastest_interval_map.cpp |     2 ++                                      
   sandbox/itl/libs/itl/test/test_interval_map_mixed.hpp                    |     8 +++-----                                
   sandbox/itl/libs/itl/test/test_value_maker.hpp                           |     4 ++--                                    
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: sandbox/itl/libs/itl/test/fastest_interval_map_/fastest_interval_map.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_interval_map_/fastest_interval_map.cpp	(original)
+++ sandbox/itl/libs/itl/test/fastest_interval_map_/fastest_interval_map.cpp	2009-07-05 04:32:42 EDT (Sun, 05 Jul 2009)
@@ -15,6 +15,8 @@
 #include "../test_value_maker.hpp"
 
 #include <boost/itl/interval_map.hpp>
+#include <boost/itl/separate_interval_set.hpp>
+#include <boost/itl/split_interval_set.hpp>
 
 using namespace std;
 using namespace boost;

Modified: sandbox/itl/libs/itl/test/test_interval_map_mixed.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_mixed.hpp	(original)
+++ sandbox/itl/libs/itl/test/test_interval_map_mixed.hpp	2009-07-05 04:32:42 EDT (Sun, 05 Jul 2009)
@@ -249,8 +249,6 @@
 template <class T, class U> 
 void interval_map_mixed_add2_4_bicremental_types()
 {         
-	typedef bicremental_type_2 T;
-    typedef int U;
     typedef interval_map<T,U>        IntervalMapT;
     typedef split_interval_map<T,U> SplitIntervalMapT;
     U u1 = make<U>(1);
@@ -293,8 +291,6 @@
 template <class T, class U> 
 void interval_map_mixed_subtract_4_bicremental_types()
 {         
-	typedef bicremental_type_3 T;
-    typedef int U;
     typedef interval_map<T,U>        IntervalMapT;
     typedef split_interval_map<T,U> SplitIntervalMapT;
     U u1 = make<U>(1);
@@ -1264,4 +1260,6 @@
 
 
 
-#endif __test_itl_interval_map_mixed_hpp_JOFA_081005__
+#endif // __test_itl_interval_map_mixed_hpp_JOFA_081005__
+
+

Modified: sandbox/itl/libs/itl/test/test_value_maker.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_value_maker.hpp	(original)
+++ sandbox/itl/libs/itl/test/test_value_maker.hpp	2009-07-05 04:32:42 EDT (Sun, 05 Jul 2009)
@@ -83,7 +83,7 @@
     typedef typename ItvMapT::domain_mapping_type domain_mapping_type;
     typedef std::pair<domain_type, codomain_type> std_pair_type; 
 
-    static interval<domain_type> interval(int lower, int upper, int bounds = 2)
+    static interval<domain_type> interval_(int lower, int upper, int bounds = 2)
     {
         return interval_type(test_value<domain_type>::make(lower), 
                              test_value<domain_type>::make(upper), bounds);
@@ -91,7 +91,7 @@
 
     static value_type val_pair(int lower, int upper, int val, int bounds = 2)
     {
-        return value_type( interval(lower, upper, bounds), 
+        return value_type( interval_(lower, upper, bounds), 
                            test_value<codomain_type>::make(val) );
     }