[Boost-commit] svn:boost r66164 - in sandbox/itl: boost/itl boost/itl/concept/interval boost/itl/type_traits libs/itl_xt/test

Subject: [Boost-commit] svn:boost r66164 - in sandbox/itl: boost/itl boost/itl/concept/interval boost/itl/type_traits libs/itl_xt/test
From: afojgo_at_[hidden]
Date: 2010-10-24 14:44:47

Author: jofaber
Date: 2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
New Revision: 66164
URL: http://svn.boost.org/trac/boost/changeset/66164

Log:
Some adjustments of icl_xt code and examples. Stable{msvc-9.0,10.0, gcc-3.4.4}

Removed:
   sandbox/itl/boost/itl/concept/interval/base.hpp
   sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp
Text files modified: 
   sandbox/itl/boost/itl/associative_element_container.hpp  |     1 +                                       
   sandbox/itl/boost/itl/associative_interval_container.hpp |     1 +                                       
   sandbox/itl/libs/itl_xt/test/itvmaptester.h              |     6 +++---                                  
   3 files changed, 5 insertions(+), 3 deletions(-)

Modified: sandbox/itl/boost/itl/associative_element_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/associative_element_container.hpp	(original)
+++ sandbox/itl/boost/itl/associative_element_container.hpp	2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
@@ -9,6 +9,7 @@
 #define BOOST_ICL_ASSOCIATIVE_ELEMENT_CONTAINER_HPP_JOFA_101023
 
 #include <boost/itl/detail/map_algo.hpp>
+#include <boost/itl/concept/comparable.hpp>
 #include <boost/itl/concept/container.hpp>
 #include <boost/itl/concept/element_set.hpp>
 #include <boost/itl/concept/element_map.hpp>

Modified: sandbox/itl/boost/itl/associative_interval_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/associative_interval_container.hpp	(original)
+++ sandbox/itl/boost/itl/associative_interval_container.hpp	2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
@@ -8,6 +8,7 @@
 #ifndef BOOST_ICL_ASSOCIATIVE_INTERVAL_CONTAINER_HPP_JOFA_101023
 #define BOOST_ICL_ASSOCIATIVE_INTERVAL_CONTAINER_HPP_JOFA_101023
 
+#include <boost/itl/concept/comparable.hpp>
 #include <boost/itl/concept/joinable.hpp>
 #include <boost/itl/concept/container.hpp>
 #include <boost/itl/concept/interval_set.hpp>

Deleted: sandbox/itl/boost/itl/concept/interval/base.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval/base.hpp	2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
+++ (empty file)
@@ -1,52 +0,0 @@
-/*-----------------------------------------------------------------------------+    
-Copyright (c) 2010-2010: Joachim Faulhaber
-+------------------------------------------------------------------------------+
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENCE.txt or copy at
-           http://www.boost.org/LICENSE_1_0.txt)
-+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ICL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
-#define BOOST_ICL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
-
-/*CL remove file
-
-#include <boost/itl/type_traits/is_combinable.hpp>
-
-namespace boost{ namespace icl
-{
-
-template<class Type>
-inline typename enable_if<is_interval_map<Type>, typename Type::segment_type>::type
-make_segment(const typename Type::element_type& element)
-{
-    typedef typename Type::interval_type interval_type;
-    typedef typename Type::segment_type  segment_type;
-    return segment_type(icl::singleton<interval_type>(element.key), element.data);
-}
-
-namespace segmental
-{
-    template<class Type>
-    typename enable_if<is_interval_set<Type>, bool>::type
-    is_joinable(typename Type::iterator it_, typename Type::iterator next_, Type* = 0)
-    {
-        return touches(*it_, *next_);
-    }
-
-    template<class Type>
-    typename enable_if<is_interval_map<Type>, bool>::type
-    is_joinable(typename Type::iterator it_, typename Type::iterator next_, Type* = 0)
-    {
-        return touches(it_->first, next_->first)
-            && it_->second == next_->second    ;
-    }
-}
-
-
-}} // namespace boost icl
-
-*/
-
-#endif
-
-

Deleted: sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp	2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
+++ (empty file)
@@ -1,32 +0,0 @@
-/*-----------------------------------------------------------------------------+    
-Copyright (c) 2008-2009: Joachim Faulhaber
-+------------------------------------------------------------------------------+
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENCE.txt or copy at
-           http://www.boost.org/LICENSE_1_0.txt)
-+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ICL_TYPE_TRAITS_IS_ASSOC_ELEMENT_CONTAINER_HPP_JOFA_100831
-#define BOOST_ICL_TYPE_TRAITS_IS_ASSOC_ELEMENT_CONTAINER_HPP_JOFA_100831
-
-#include <boost/mpl/and.hpp> 
-#include <boost/mpl/or.hpp> 
-#include <boost/mpl/not.hpp> 
-#include <boost/itl/type_traits/is_element_container.hpp> 
-#include <boost/itl/type_traits/is_set.hpp> 
-
-namespace boost{ namespace icl
-{
-    template <class Type> 
-    struct is_assoc_element_container
-    { 
-        typedef is_assoc_element_container type;
-        BOOST_STATIC_CONSTANT(bool, value = 
-            (mpl::or_<is_element_set<Type>, is_element_map<Type> >::value));
-    };
-
-
-}} // namespace boost icl
-
-#endif
-
-

Modified: sandbox/itl/libs/itl_xt/test/itvmaptester.h
==============================================================================
--- sandbox/itl/libs/itl_xt/test/itvmaptester.h	(original)
+++ sandbox/itl/libs/itl_xt/test/itvmaptester.h	2010-10-24 14:44:44 EDT (Sun, 24 Oct 2010)
@@ -459,20 +459,20 @@
     m_ContainerGentor.some(erasure);
 
     interval_set_type erasureDomain;
-    domain(erasure, erasureDomain);
+    domain(erasureDomain, erasure);
 
     ItvMapTV xxResid = xx;
     xxResid -= erasureDomain;
 
     interval_set_type xxDomain;
-    domain(xx, xxDomain);
+    domain(xxDomain, xx);
 
     interval_set_type erasureComplement;
     erasureComplement = xxDomain;
     erasureComplement -= erasureDomain;
 
     ItvMapTV xxSect;
-    xx.add_intersection(xxSect, erasureComplement);
+    add_intersection(xxSect, xx, erasureComplement);
 
     if(! is_element_equal(xxResid, xxSect) ) {
         x = xx; y = erasureDomain; xDom_minus_y = erasureComplement;