Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r69070 - in sandbox/icl: boost/icl boost/icl/concept boost/validate/driver libs/icl libs/icl/example libs/icl/test libs/icl/test/test_casual_ libs/icl_xt/example/casual_sample_ libs/validate/example/labat_multi_
From: afojgo_at_[hidden]
Date: 2011-02-19 17:35:16

Author: jofaber
Date: 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
New Revision: 69070
URL: http://svn.boost.org/trac/boost/changeset/69070

Log:
Bug fixes: Fixed enable_if guards for functions intersects, disjoint for domain and interval types and for lower, upper, first and last on interval containers. Added tests to the icl test suite.
Properties modified:
   sandbox/icl/boost/icl/ (props changed)
   sandbox/icl/libs/icl/ (props changed)
   sandbox/icl/libs/icl/example/ (props changed)
   sandbox/icl/libs/icl/test/ (props changed)
Text files modified:
   sandbox/icl/boost/icl/concept/interval_associator.hpp | 47 +++++++++++--------
   sandbox/icl/boost/icl/concept/interval_map.hpp | 6 +-
   sandbox/icl/boost/validate/driver/icl_driver.hpp | 6 +-
   sandbox/icl/libs/icl/test/fastest_interval_map_cases.hpp | 4 +
   sandbox/icl/libs/icl/test/fastest_interval_set_cases.hpp | 8 +++
   sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp | 91 ++++++++++++++++++++++-----------------
   sandbox/icl/libs/icl/test/test_interval_map_shared.hpp | 46 ++++++++++++++++++++
   sandbox/icl/libs/icl/test/test_interval_set_cases.hpp | 9 +++
   sandbox/icl/libs/icl/test/test_interval_set_shared.hpp | 54 +++++++++++++++++++++++
   sandbox/icl/libs/icl/test/test_type_lists.hpp | 16 +++---
   sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln | 6 --
   sandbox/icl/libs/icl_xt/example/casual_sample_/casual_sample.cpp | 12 ++--
   sandbox/icl/libs/validate/example/labat_multi_/labat_multi.cpp | 10 ++--
   13 files changed, 226 insertions(+), 89 deletions(-)

Modified: sandbox/icl/boost/icl/concept/interval_associator.hpp
==============================================================================
--- sandbox/icl/boost/icl/concept/interval_associator.hpp (original)
+++ sandbox/icl/boost/icl/concept/interval_associator.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -220,23 +220,25 @@

template<class Type>
typename enable_if<is_interval_container<Type>,
- typename Type::interval_type>::type
+ typename domain_type_of<Type>::type>::type
lower(const Type& object)
{
+ typedef typename domain_type_of<Type>::type DomainT;
     return
         icl::is_empty(object)
- ? identity_element<typename Type::interval_type>::value()
+ ? unit_element<DomainT>::value()
             : icl::lower( key_value<Type>(object.begin()) );
}

template<class Type>
typename enable_if<is_interval_container<Type>,
- typename Type::interval_type>::type
+ typename domain_type_of<Type>::type>::type
upper(const Type& object)
{
+ typedef typename domain_type_of<Type>::type DomainT;
     return
         icl::is_empty(object)
- ? identity_element<typename Type::interval_type>::value()
+ ? identity_element<DomainT>::value()
             : icl::upper( key_value<Type>(object.rbegin()) );
}

@@ -244,26 +246,28 @@
template<class Type>
typename enable_if
< mpl::and_< is_interval_container<Type>
- , is_discrete<typename Type::domain_type> >
-, typename Type::interval_type>::type
+ , is_discrete<typename domain_type_of<Type>::type> >
+, typename domain_type_of<Type>::type>::type
first(const Type& object)
{
+ typedef typename domain_type_of<Type>::type DomainT;
     return
         icl::is_empty(object)
- ? identity_element<typename Type::interval_type>::value()
+ ? unit_element<DomainT>::value()
             : icl::first( key_value<Type>(object.begin()) );
}

template<class Type>
typename enable_if
< mpl::and_< is_interval_container<Type>
- , is_discrete<typename Type::domain_type> >
-, typename Type::interval_type>::type
+ , is_discrete<typename domain_type_of<Type>::type> >
+, typename domain_type_of<Type>::type>::type
last(const Type& object)
{
+ typedef typename domain_type_of<Type>::type DomainT;
     return
         icl::is_empty(object)
- ? identity_element<typename Type::interval_type>::value()
+ ? identity_element<DomainT>::value()
             : icl::last( key_value<Type>(object.rbegin()) );
}

@@ -646,7 +650,7 @@
//------------------------------------------------------------------------------
template<class Type, class CoType>
typename enable_if<mpl::and_< is_interval_container<Type>
- , is_same<CoType, domain_type_of<Type> > >,
+ , is_same<CoType, typename domain_type_of<Type>::type> >,
                    bool>::type
intersects(const Type& left, const CoType& right)
{
@@ -655,13 +659,14 @@

template<class Type, class CoType>
typename enable_if<mpl::and_< is_interval_container<Type>
- , is_same<CoType, interval_type_of<Type> > >,
+ , is_same<CoType, typename interval_type_of<Type>::type> >,
                    bool>::type
intersects(const Type& left, const CoType& right)
{
     return left.find(right) != left.end();
}

+
template<class LeftT, class RightT>
typename enable_if< mpl::and_< is_intra_combinable<LeftT, RightT>
                              , mpl::or_<is_total<LeftT>, is_total<RightT> > >
@@ -720,14 +725,15 @@
     return false;
}

-template<class Type, class AssociateT>
-typename enable_if<mpl::and_< is_interval_map<Type>
- , is_inter_derivative<Type, AssociateT> >,
- bool>::type
-intersects(const Type& left, const AssociateT& right)
-{
- return icl::intersects(left, right);
-}
+//CL?
+//template<class Type, class AssociateT>
+//typename enable_if<mpl::and_< is_interval_map<Type>
+// , is_inter_derivative<Type, AssociateT> >,
+// bool>::type
+//intersects(const Type& left, const AssociateT& right)
+//{
+// return icl::intersects(left, right);
+//}

/** \b Returns true, if \c left and \c right have no common elements.
     Intervals are interpreted as sequence of elements.
@@ -750,6 +756,7 @@
     return !intersects(left,right);
}

+
//==============================================================================
//= Symmetric difference<IntervalSet|IntervalSet>
//==============================================================================

Modified: sandbox/icl/boost/icl/concept/interval_map.hpp
==============================================================================
--- sandbox/icl/boost/icl/concept/interval_map.hpp (original)
+++ sandbox/icl/boost/icl/concept/interval_map.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -433,7 +433,7 @@
template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
                             , is_total<Type>
- , is_same<OperandT, segment_type_of<Type> > >,
+ , is_same<OperandT, typename segment_type_of<Type>::type> >,
                    bool>::type
intersects(const Type&, const OperandT&)
{
@@ -443,7 +443,7 @@
template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
                             , mpl::not_<is_total<Type> >
- , is_same<OperandT, segment_type_of<Type> > >,
+ , is_same<OperandT, typename segment_type_of<Type>::type> >,
                    bool>::type
intersects(const Type& object, const OperandT& operand)
{
@@ -454,7 +454,7 @@

template<class Type, class OperandT>
typename enable_if<mpl::and_< is_interval_map<Type>
- , is_same<OperandT, element_type_of<Type> > >,
+ , is_same<OperandT, typename element_type_of<Type>::type> >,
                    bool>::type
intersects(const Type& object, const OperandT& operand)
{

Modified: sandbox/icl/boost/validate/driver/icl_driver.hpp
==============================================================================
--- sandbox/icl/boost/validate/driver/icl_driver.hpp (original)
+++ sandbox/icl/boost/validate/driver/icl_driver.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -138,8 +138,8 @@

         void reportFrequencies()
         {
- extern boost::mutex g_Mutex; //JODO URG REV ...
- g_Mutex.lock();
+ extern boost::mutex g_Mutex; //JODO URG REV ...
+ g_Mutex.lock();
             std::cout << "------------------------------------------------------------------------------" << std::endl;
             std::cout << "--- Successfully tested law instantiation -------------------------runs---time" << std::endl;
             int valid_count = 1;
@@ -184,7 +184,7 @@
             }
             if(!icl::is_empty(_violations))
                 std::cout << "------------------------------------------------------------------------------" << std::endl;
- g_Mutex.unlock();
+ g_Mutex.unlock();
         }

         void reportFrequencies(const std::string& filename)

Modified: sandbox/icl/libs/icl/test/fastest_interval_map_cases.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/fastest_interval_map_cases.hpp (original)
+++ sandbox/icl/libs/icl/test/fastest_interval_map_cases.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -79,6 +79,10 @@
(fastest_icl_interval_map_element_iter_4_discrete_types)
{ interval_map_element_iter_4_discrete_types<discrete_type_2, int, partial_absorber, INTERVAL_MAP>();}

+BOOST_AUTO_TEST_CASE
+(fastest_icl_interval_map_intersects_4_bicremental_types)
+{ interval_map_intersects_4_bicremental_types<INTERVAL_MAP, bicremental_type_3, int>();}
+

#endif // BOOST_ICL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702

Modified: sandbox/icl/libs/icl/test/fastest_interval_set_cases.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/fastest_interval_set_cases.hpp (original)
+++ sandbox/icl/libs/icl/test/fastest_interval_set_cases.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -60,6 +60,14 @@
(fastest_icl_interval_set_element_iter_4_discrete_types)
{ interval_set_element_iter_4_discrete_types<INTERVAL_SET, discrete_type_2>();}

+BOOST_AUTO_TEST_CASE
+(fastest_icl_interval_set_intersects_4_bicremental_types)
+{ interval_set_intersects_4_bicremental_types<INTERVAL_SET, bicremental_type_3>();}
+
+BOOST_AUTO_TEST_CASE
+(fastest_icl_interval_set_range_4_discrete_types)
+{ interval_set_range_4_discrete_types<INTERVAL_SET, discrete_type_3>();}
+
#endif // BOOST_ICL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702

Modified: sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp (original)
+++ sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -17,11 +17,13 @@
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"

+#include <boost/type_traits/is_same.hpp>
+
#include <boost/icl/gregorian.hpp>
#include <boost/icl/ptime.hpp>
-#include <boost/icl/xint.hpp>

#include <boost/icl/interval_map.hpp>
+#include <boost/icl/interval_set.hpp>
#include <boost/icl/interval.hpp>

using namespace std;
@@ -30,58 +32,69 @@
using namespace boost::icl;
using namespace boost::posix_time;
using namespace boost::gregorian;
-using namespace boost::xint;

-BOOST_AUTO_TEST_CASE(casual)
+
+BOOST_AUTO_TEST_CASE(float_infinity)
{
- //typedef int T;
- //typedef int U;
- //typedef interval_map<T,U, total_absorber> IntervalMapT;
- //typedef interval_set<T> IntervalSetT;
- //typedef IntervalMapT::interval_type IntervalT;
- namespace xopts = boost::xint::options;

- typedef boost::xint::integer_t<xopts::fixedlength<512>, xopts::secure, xopts::negative_modulus> uint512;
- typedef boost::xint::detail::integer_t_data
- <xopts::fixedlength<512>, xopts::secure, xopts::negative_modulus,
- parameter::void_, parameter::void_, parameter::void_> uint512_d;
+ typedef size_type_of<interval<float>::type>::type itv_float_size_type;

- bool is_itg_xint = boost::is_integral<xint::integer>::value;
+ BOOST_CHECK( (is_same<size_type_of<interval<float>::type>::type, std::size_t>::value) );
+ BOOST_CHECK( (is_same<itv_float_size_type, std::size_t>::value) );
+ BOOST_CHECK( (is_same<itv_float_size_type, unsigned int>::value) );
+
+ cout << cardinality(interval<float>::closed(1,5)) << endl;
+ cout << icl::infinity<size_type_of<interval<float>::type>::type>::value() << endl;
+ //cout << (std::size_t)(icl::infinity<itv_float_size_type>::value) << endl;
+ cout << (std::numeric_limits<unsigned int>::max)() << endl;
+
+ BOOST_CHECK_EQUAL(
+ cardinality(interval<float>::closed(1,5))
+ , icl::infinity<itv_float_size_type>::value()
+ );

- typedef integer_t<>::datatype base_type;
+ BOOST_CHECK_EQUAL(true, true);
+}

+BOOST_AUTO_TEST_CASE(lower_empty)
+{

- /*
- uint512* p_ui = new uint512;
- (*p_ui) += 512;
- cout << (*p_ui) << endl;
+{
+ icl::interval_set<int> iclset;
+ iclset += interval<int>::right_open(1,5);
+ icl::interval_set<int> one;
+ one += 1;
+ BOOST_CHECK(icl::intersects( iclset, one ));
+ BOOST_CHECK(!icl::disjoint( iclset, one ));
+}
+
+ BOOST_CHECK_EQUAL(true, true);
+}

- uint512_d* p_ui_d = p_ui;
- delete p_ui_d;
- */
+BOOST_AUTO_TEST_CASE(casual)
+{
+ //typedef int T;
+ //typedef int U;
+ //typedef interval_map<T,U, total_absorber> IntervalMapT;
+ //typedef interval_set<T> IntervalSetT;
+ //typedef IntervalMapT::interval_type IntervalT;

- unsigned int k = 2;
- k -= 3;
- cout << k << endl;

- //interval_set<int>* p_is = new interval_set<int>;
- //interval_set<int>::base_type* p_bis = p_is;
- //delete p_bis;
+ interval_set<int> iclset;
+ interval<int>::type itv;
+ BOOST_CHECK(is_interval_container<interval_set<int> >::value);
+ BOOST_CHECK((is_same<int, typename domain_type_of<interval_set<int> >::type >::value));

- //integer* p_itg = new integer;
- //(*p_itg) += 42;
- //cout << (*p_itg) << endl;
+ icl::contains(iclset, 1);
+ icl::within(1, iclset);

- ////boost::xint::detail::integer_t_data<>*
- //integer_t<>* p_itg_td = p_itg;
- //(*p_itg_td) += 1;
- //cout << (*p_itg_td) << endl;
+ icl::intersects(iclset, 1);
+ icl::intersects(iclset, itv);

- //delete p_itg_td;
+ icl::disjoint(iclset, 1);
+ icl::disjoint(iclset, itv);

- cout << "is_specialized: "
- << std::numeric_limits<boost::xint::integer>::is_specialized << endl;

- BOOST_CHECK_EQUAL(true, is_itg_xint);
+ BOOST_CHECK_EQUAL(true, true);
}

Modified: sandbox/icl/libs/icl/test/test_interval_map_shared.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_interval_map_shared.hpp (original)
+++ sandbox/icl/libs/icl/test/test_interval_map_shared.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -1309,5 +1309,51 @@

}

+
+template
+<
+#if (defined(__GNUC__) && (__GNUC__ < 4)) //MEMO Can be simplified, if gcc-3.4 is obsolete
+ ICL_IntervalMap_TEMPLATE(T,U,Traits,partial_absorber) IntervalMap,
+#else
+ ICL_IntervalMap_TEMPLATE(_T,_U,Traits,partial_absorber) IntervalMap,
+#endif
+ class T, class U
+>
+void interval_map_intersects_4_bicremental_types()
+{
+ // Test of intersects and disjoint for domain_type and interval_type.
+ typedef IntervalMap<T,U> IntervalMapT;
+ typedef typename IntervalMapT::interval_type IntervalT;
+
+ typename IntervalMapT::interval_mapping_type val_pair1 = IDv(6,9,1);
+ std::pair<const IntervalT, U> val_pair2 = IDv(3,5,3);
+ mapping_pair<T,U> map_pair = K_v(4,3);
+
+ IntervalMapT map_a;
+ map_a.add(CDv(1,3,1)).add(IDv(8,9,1)).add(IIv(6,11,3));
+
+ BOOST_CHECK( icl::is_interval_container<IntervalMapT>::value );
+ BOOST_CHECK( icl::has_domain_type<IntervalMapT>::value );
+ BOOST_CHECK( (is_same<T, typename domain_type_of<IntervalMapT>::type>::value) );
+
+ BOOST_CHECK( icl::intersects(map_a, MK_v(2) ) );
+ BOOST_CHECK( icl::intersects(map_a, MK_v(11)) );
+ BOOST_CHECK( icl::disjoint(map_a, MK_v(1) ) );
+ BOOST_CHECK( icl::disjoint(map_a, MK_v(12)) );
+
+ BOOST_CHECK( icl::intersects(map_a, I_D(2,3)) );
+ BOOST_CHECK( icl::intersects(map_a, I_D(6,8)) );
+ BOOST_CHECK( icl::disjoint(map_a, I_D(3,5)) );
+ BOOST_CHECK( icl::disjoint(map_a, I_D(12,14)) );
+
+ //-------------------------------------+
+ // (1 3) [6 8)[8 9)[9 11]
+ // 1 3 4 3
+ //mapping_pair<T,U> map_pair_2_1 = K_v(2,1);
+ //BOOST_CHECK( icl::intersects(map_a, map_pair_2_1 ) ); //JODO
+
+}
+
+
#endif // LIBS_ICL_TEST_TEST_INTERVAL_MAP_SHARED_HPP_JOFA_081005

Modified: sandbox/icl/libs/icl/test/test_interval_set_cases.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_interval_set_cases.hpp (original)
+++ sandbox/icl/libs/icl/test/test_interval_set_cases.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -60,6 +60,15 @@
(test_icl_interval_set_element_iter_4_discrete_types, T, discrete_types)
{ interval_set_element_iter_4_discrete_types<INTERVAL_SET, T>();}

+BOOST_AUTO_TEST_CASE_TEMPLATE
+(test_icl_interval_set_intersects_4_bicremental_types, T, bicremental_types)
+{ interval_set_intersects_4_bicremental_types<INTERVAL_SET, T>();}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE
+(test_icl_interval_set_range_4_discrete_types, T, discrete_types)
+{ interval_set_range_4_discrete_types<INTERVAL_SET, T>();}
+
+
#endif // BOOST_ICL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701

Modified: sandbox/icl/libs/icl/test/test_interval_set_shared.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_interval_set_shared.hpp (original)
+++ sandbox/icl/libs/icl/test/test_interval_set_shared.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -696,6 +696,60 @@
BOOST_CHECK_EQUAL( found == set_a.end(), true );
}

+
+template <ICL_IntervalSet_TEMPLATE(_T) IntervalSet, class T>
+void interval_set_intersects_4_bicremental_types()
+{
+ typedef IntervalSet<T> IntervalSetT;
+ typedef typename IntervalSetT::interval_type IntervalT;
+ typedef typename IntervalSetT::key_type KeyT;
+
+ IntervalT between = I_D(3,5);
+
+ IntervalSetT set_a;
+ set_a.add(C_D(1,3)).add(I_I(6,11));
+ // (1 3) [6 11]
+ BOOST_CHECK( icl::intersects(set_a, MK_v(2)) );
+ BOOST_CHECK( icl::intersects(set_a, MK_v(11)) );
+ BOOST_CHECK( icl::disjoint(set_a, MK_v(3)) );
+ BOOST_CHECK( icl::disjoint(set_a, MK_v(5)) );
+
+ BOOST_CHECK( icl::intersects(set_a, C_D(1,3)) );
+ BOOST_CHECK( icl::intersects(set_a, I_D(8,10)) );
+ BOOST_CHECK( icl::disjoint(set_a, between) );
+ BOOST_CHECK( icl::disjoint(set_a, I_I(0,1)) );
+
+ IntervalSetT to_12 = IntervalSetT(I_D(0, 13));
+ IntervalSetT complement_a = to_12 - set_a;
+ BOOST_CHECK( icl::disjoint(set_a, complement_a) );
+ BOOST_CHECK( icl::intersects(to_12, set_a) );
+
+ BOOST_CHECK_EQUAL( icl::lower(set_a), icl::lower(*(set_a.begin())) );
+ BOOST_CHECK_EQUAL( icl::lower(set_a), MK_v(1) );
+ BOOST_CHECK_EQUAL( icl::upper(set_a), icl::upper(*(set_a.rbegin())) );
+ BOOST_CHECK_EQUAL( icl::upper(set_a), MK_v(11) );
+}
+
+
+template <ICL_IntervalSet_TEMPLATE(_T) IntervalSet, class T>
+void interval_set_range_4_discrete_types()
+{
+ typedef IntervalSet<T> IntervalSetT;
+ typedef typename IntervalSetT::interval_type IntervalT;
+ typedef typename IntervalSetT::key_type KeyT;
+
+ IntervalT between = I_D(3,5);
+
+ IntervalSetT set_a;
+ set_a.add(C_D(1,3)).add(I_I(6,11));
+ // (1 3) [6 11]
+ BOOST_CHECK_EQUAL( icl::first(set_a), icl::first(*(set_a.begin())) );
+ BOOST_CHECK_EQUAL( icl::first(set_a), MK_v(2) );
+ BOOST_CHECK_EQUAL( icl::last(set_a), icl::last(*(set_a.rbegin())) );
+ BOOST_CHECK_EQUAL( icl::last(set_a), MK_v(11) );
+}
+
+
template <ICL_IntervalSet_TEMPLATE(_T) IntervalSet, class T>
void interval_bitset_find_4_integral_types()
{

Modified: sandbox/icl/libs/icl/test/test_type_lists.hpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_type_lists.hpp (original)
+++ sandbox/icl/libs/icl/test/test_type_lists.hpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -31,8 +31,10 @@
#else
typedef boost::posix_time::ptime boost_posix_time_ptime;
typedef boost::posix_time::time_duration boost_posix_time_duration;
-typedef boost::gregorian::date boost_gregorian_date;
-typedef boost::gregorian::date_duration boost_gregorian_date_duration;
+typedef int boost_gregorian_date;
+typedef int boost_gregorian_date_duration;
+//typedef boost::gregorian::date boost_gregorian_date; //JODO URG REV
+//typedef boost::gregorian::date_duration boost_gregorian_date_duration;
#endif

typedef ::boost::mpl::list<
@@ -41,7 +43,7 @@
     ,float, double, long double
     ,boost::rational<int>
#ifdef BOOST_ICL_TEST_XINT
- ,boost::xint::integer
+ ,boost::xint::integer
     ,boost::rational<boost::xint::integer>
#endif
     ,boost_posix_time_ptime
@@ -66,7 +68,7 @@
     ,float, double, long double
     ,boost::rational<int>
#ifdef BOOST_ICL_TEST_XINT
- ,boost::xint::integer
+ ,boost::xint::integer
     ,boost::rational<boost::xint::integer>
#endif
> signed_bicremental_types;
@@ -100,7 +102,7 @@
     ,unsigned long, unsigned long long
     ,short, int, long, long long
#ifdef BOOST_ICL_TEST_XINT
- ,boost::xint::integer
+ ,boost::xint::integer
#endif
> integral_types;

@@ -116,7 +118,7 @@
     ,unsigned long, unsigned long long
     ,short, int, long
#ifdef BOOST_ICL_TEST_XINT
- ,boost::xint::integer
+ ,boost::xint::integer
#endif
     ,boost_posix_time_ptime
     ,boost_posix_time_ptime
@@ -174,7 +176,7 @@
     ,float, double, long double
     ,boost::rational<int>
#ifdef BOOST_ICL_TEST_XINT
- ,boost::xint::integer
+ ,boost::xint::integer
#endif
     ,std::string
     ,boost_posix_time_ptime

Modified: sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln
==============================================================================
--- sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln (original)
+++ sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -57,8 +57,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_fix_icl_after_thread", "fix_icl_after_thread_\vc9_fix_icl_after_thread.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_fix_syntax_effect_thread", "fix_syntax_effect_thread_\vc9_fix_syntac_effect_thread.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA1}"
-EndProject
Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
@@ -177,10 +175,6 @@
                 {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Debug|Win32.Build.0 = Debug|Win32
                 {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Release|Win32.ActiveCfg = Release|Win32
                 {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Release|Win32.Build.0 = Release|Win32
- {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA1}.Debug|Win32.ActiveCfg = Debug|Win32
- {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA1}.Debug|Win32.Build.0 = Debug|Win32
- {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA1}.Release|Win32.ActiveCfg = Release|Win32
- {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA1}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE

Modified: sandbox/icl/libs/icl_xt/example/casual_sample_/casual_sample.cpp
==============================================================================
--- sandbox/icl/libs/icl_xt/example/casual_sample_/casual_sample.cpp (original)
+++ sandbox/icl/libs/icl_xt/example/casual_sample_/casual_sample.cpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -16,17 +16,17 @@

int foo(int x)
{
- int bar(int x)
- {
- return x+x;
- }
+ int bar(int x)
+ {
+ return x+x;
+ }

- return bar(x);
+ return bar(x);
}

int main()
{
- cout << foo(1) << endl;
+ cout << foo(1) << endl;
return 0;
}

Modified: sandbox/icl/libs/validate/example/labat_multi_/labat_multi.cpp
==============================================================================
--- sandbox/icl/libs/validate/example/labat_multi_/labat_multi.cpp (original)
+++ sandbox/icl/libs/validate/example/labat_multi_/labat_multi.cpp 2011-02-19 17:35:12 EST (Sat, 19 Feb 2011)
@@ -28,7 +28,7 @@
void test_abelian_monoid(int size)
{
     abelian_monoid_driver model_tester;
- g_Mutex.lock();
+ g_Mutex.lock();
     cout <<
     ">> ------------------------------------------------------ <<\n"
     ">> -------- Law based test automaton 'LaBatea' ---------- <<\n"
@@ -37,8 +37,8 @@
     ">> ------------------------------------------------------ <<\n";
     GentorProfileSgl::it()->set_std_profile(size,1);
     GentorProfileSgl::it()->report_profile();
- g_Mutex.unlock();
- wait(1);
+ g_Mutex.unlock();
+ wait(1);

     model_tester.terminate_at_law_count(18, 100);

@@ -47,12 +47,12 @@

void tread_abelian_monoid_1()
{
- test_abelian_monoid(16);
+ test_abelian_monoid(16);
}

void tread_abelian_monoid_2()
{
- test_abelian_monoid(77);
+ test_abelian_monoid(77);
}

void thread_()

Date view	Thread view	Subject view	Author view

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