Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r66356 - in sandbox/icl: boost/icl boost/validate/driver boost/validate/gentor boost/validate/laws libs/validate/example libs/validate/example/labat_map_order_ libs/validate/example/labat_set_order_
From: afojgo_at_[hidden]
Date: 2010-11-02 11:50:10


Author: jofaber
Date: 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
New Revision: 66356
URL: http://svn.boost.org/trac/boost/changeset/66356

Log:
Adapted law based tests to gcc-4.4.1.
Text files modified:
   sandbox/icl/boost/icl/interval_base_set.hpp | 2 --
   sandbox/icl/boost/validate/driver/icl_morphic_driver.hpp | 1 +
   sandbox/icl/boost/validate/driver/icl_set_driver.hpp | 1 +
   sandbox/icl/boost/validate/gentor/rangegentor.hpp | 2 +-
   sandbox/icl/boost/validate/laws/order.hpp | 10 +++++-----
   sandbox/icl/libs/validate/example/Jamfile.v2 | 20 --------------------
   sandbox/icl/libs/validate/example/labat_map_order_/labat_map_order.cpp | 3 ++-
   sandbox/icl/libs/validate/example/labat_set_order_/labat_set_order.cpp | 3 ++-
   8 files changed, 12 insertions(+), 30 deletions(-)

Modified: sandbox/icl/boost/icl/interval_base_set.hpp
==============================================================================
--- sandbox/icl/boost/icl/interval_base_set.hpp (original)
+++ sandbox/icl/boost/icl/interval_base_set.hpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -31,8 +31,6 @@
 #include <boost/icl/detail/interval_set_algo.hpp>
 #include <boost/icl/detail/exclusive_less_than.hpp>
 
-#include <boost/icl/associative_interval_container.hpp>
-
 #include <boost/icl/right_open_interval.hpp>
 #include <boost/icl/continuous_interval.hpp>
 #include <boost/icl/detail/notate.hpp>

Modified: sandbox/icl/boost/validate/driver/icl_morphic_driver.hpp
==============================================================================
--- sandbox/icl/boost/validate/driver/icl_morphic_driver.hpp (original)
+++ sandbox/icl/boost/validate/driver/icl_morphic_driver.hpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <boost/icl/associative_element_container.hpp>
 #include <boost/icl/interval_set.hpp>
 #include <boost/icl/separate_interval_set.hpp>
 #include <boost/icl/split_interval_set.hpp>

Modified: sandbox/icl/boost/validate/driver/icl_set_driver.hpp
==============================================================================
--- sandbox/icl/boost/validate/driver/icl_set_driver.hpp (original)
+++ sandbox/icl/boost/validate/driver/icl_set_driver.hpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <boost/icl/associative_element_container.hpp>
 #include <boost/icl/interval_set.hpp>
 #include <boost/icl/separate_interval_set.hpp>
 #include <boost/icl/split_interval_set.hpp>

Modified: sandbox/icl/boost/validate/gentor/rangegentor.hpp
==============================================================================
--- sandbox/icl/boost/validate/gentor/rangegentor.hpp (original)
+++ sandbox/icl/boost/validate/gentor/rangegentor.hpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -78,7 +78,7 @@
         Type lwb, upb;
         _lwbGentor.some(lwb);
         _upbGentor.some(upb);
- _last = right_open_interval(lwb, upb);
+ _last = interval_type::right_open(lwb, upb);
         x = _last;
     }
 

Modified: sandbox/icl/boost/validate/laws/order.hpp
==============================================================================
--- sandbox/icl/boost/validate/laws/order.hpp (original)
+++ sandbox/icl/boost/validate/laws/order.hpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -120,17 +120,17 @@
             Type a = this->template getInputValue<operand_a>();
             Type b = this->template getInputValue<operand_b>();
 
- cout << "a = " << a << endl;
- cout << "b = " << b << endl;
+ std::cout << "a = " << a << std::endl;
+ std::cout << "b = " << b << std::endl;
 
             bool a_R_b = Relation<Type>()(a,b);
- cout << "a<=b == " << a_R_b << endl;
+ std::cout << "a<=b == " << a_R_b << std::endl;
 
             bool b_R_a = Relation<Type>()(b,a);
- cout << "b<=a == " << b_R_a << endl;
+ std::cout << "b<=a == " << b_R_a << std::endl;
 
             bool a_E_b = Equality<Type>()(a,b);
- cout << "b==a == " << a_E_b << endl;
+ std::cout << "b==a == " << a_E_b << std::endl;
 
             return !(Relation<Type>()(a,b) && Relation<Type>()(b,a)) || Equality<Type>()(a,b);
         }

Modified: sandbox/icl/libs/validate/example/Jamfile.v2
==============================================================================
--- sandbox/icl/libs/validate/example/Jamfile.v2 (original)
+++ sandbox/icl/libs/validate/example/Jamfile.v2 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -30,26 +30,6 @@
         <include>$(BOOST_ROOT)
     ;
    
-exe boostcon_abelian_monoid
- :
- boostcon_abelian_monoid_/boostcon_abelian_monoid.cpp
- gentorprofile.obj
- /boost/date_time//boost_date_time
- :
- <include>../../..
- <include>$(BOOST_ROOT)
- ;
-
-exe boostcon_law_validater
- :
- boostcon_abelian_monoid_/boostcon_law_validater.cpp
- gentorprofile.obj
- /boost/date_time//boost_date_time
- :
- <include>../../..
- <include>$(BOOST_ROOT)
- ;
-
 # 2.19 msvc9 compilation time: 0:38
 exe labat_val_relations
     :

Modified: sandbox/icl/libs/validate/example/labat_map_order_/labat_map_order.cpp
==============================================================================
--- sandbox/icl/libs/validate/example/labat_map_order_/labat_map_order.cpp (original)
+++ sandbox/icl/libs/validate/example/labat_map_order_/labat_map_order.cpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -12,7 +12,8 @@
 #include <stdio.h>
 
 #include <boost/validate/loki_xt/Tuple.h>
-#include <boost/icl/map.hpp>
+#include <boost/icl/associative_element_container.hpp>
+#include <boost/icl/associative_interval_container.hpp>
 #include <boost/validate/gentor/gentorprofile.hpp>
 #include <boost/validate/gentor/rangegentor.hpp>
 

Modified: sandbox/icl/libs/validate/example/labat_set_order_/labat_set_order.cpp
==============================================================================
--- sandbox/icl/libs/validate/example/labat_set_order_/labat_set_order.cpp (original)
+++ sandbox/icl/libs/validate/example/labat_set_order_/labat_set_order.cpp 2010-11-02 11:49:56 EDT (Tue, 02 Nov 2010)
@@ -12,7 +12,8 @@
 #include <stdio.h>
 
 #include <boost/validate/loki_xt/Tuple.h>
-#include <boost/icl/map.hpp>
+#include <boost/icl/associative_element_container.hpp>
+#include <boost/icl/associative_interval_container.hpp>
 #include <boost/validate/gentor/gentorprofile.hpp>
 #include <boost/validate/gentor/rangegentor.hpp>
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk