Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r69962 - in trunk: boost/icl/concept libs/icl/test/fastest_icl_map_ libs/icl/test/fastest_partial_icl_quantifier_ libs/icl/test/fastest_partial_interval_quantifier_ libs/icl/test/fastest_set_icl_set_ libs/icl/test/fastest_set_interval_set_ libs/icl/test/fastest_total_icl_quantifier_ libs/icl/test/fastest_total_interval_quantifier_ libs/icl/test/test_changing_interval_defaults_ libs/icl/test/test_doc_code_ libs/icl/test/test_icl_map_ libs/icl/test/test_misc_ libs/icl/test/test_partial_icl_quantifier_ libs/icl/test/test_partial_interval_quantifier_ libs/icl/test/test_set_icl_set_ libs/icl/test/test_set_interval_set_ libs/icl/test/test_total_icl_quantifier_ libs/icl/test/test_total_interval_quantifier_ libs/icl/test/test_type_traits_
From: afojgo_at_[hidden]
Date: 2011-03-13 14:39:11

Author: jofaber
Date: 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
New Revision: 69962
URL: http://svn.boost.org/trac/boost/changeset/69962

Log:
Fixed standard conformance issues, detected by Doug Gregor March-05.

Text files modified:
   trunk/boost/icl/concept/element_associator.hpp | 6 ++++++
   trunk/boost/icl/concept/element_map.hpp | 7 -------
   trunk/boost/icl/concept/element_set.hpp | 7 -------
   trunk/boost/icl/concept/interval_associator.hpp | 2 +-
   trunk/boost/icl/concept/interval_associator_base.hpp | 10 +++++-----
   trunk/boost/icl/concept/interval_map.hpp | 4 ++--
   trunk/libs/icl/test/fastest_icl_map_/fastest_icl_map.cpp | 2 +-
   trunk/libs/icl/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp | 2 +-
   trunk/libs/icl/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp | 2 +-
   trunk/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set.cpp | 2 +-
   trunk/libs/icl/test/fastest_set_interval_set_/fastest_set_interval_set.cpp | 2 +-
   trunk/libs/icl/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp | 2 +-
   trunk/libs/icl/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp | 2 +-
   trunk/libs/icl/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp | 2 +-
   trunk/libs/icl/test/test_doc_code_/test_doc_code.cpp | 2 +-
   trunk/libs/icl/test/test_icl_map_/test_icl_map.cpp | 2 +-
   trunk/libs/icl/test/test_misc_/test_misc.cpp | 2 +-
   trunk/libs/icl/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp | 2 +-
   trunk/libs/icl/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp | 2 +-
   trunk/libs/icl/test/test_set_icl_set_/test_set_icl_set.cpp | 2 +-
   trunk/libs/icl/test/test_set_interval_set_/test_set_interval_set.cpp | 2 +-
   trunk/libs/icl/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp | 2 +-
   trunk/libs/icl/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp | 2 +-
   trunk/libs/icl/test/test_type_traits_/test_type_traits.cpp | 2 +-
   24 files changed, 32 insertions(+), 40 deletions(-)

Modified: trunk/boost/icl/concept/element_associator.hpp
==============================================================================
--- trunk/boost/icl/concept/element_associator.hpp (original)
+++ trunk/boost/icl/concept/element_associator.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -422,6 +422,12 @@
return object;
}

+template<class Type>
+inline typename enable_if<is_associative_element_container<Type>, Type>::type
+operator & (Type object, const Type& operand)
+{
+ return object &= operand;
+}
//------------------------------------------------------------------------------

template<class Type, class CoType>

Modified: trunk/boost/icl/concept/element_map.hpp
==============================================================================
--- trunk/boost/icl/concept/element_map.hpp (original)
+++ trunk/boost/icl/concept/element_map.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -284,13 +284,6 @@

template<class Type>
inline typename enable_if<is_element_map<Type>, Type>::type
-operator & (Type object, const Type& operand)
-{
- return object &= operand;
-}
-
-template<class Type>
-inline typename enable_if<is_element_map<Type>, Type>::type
operator & (Type object, const typename Type::key_object_type& operand)
{
return object &= operand;

Modified: trunk/boost/icl/concept/element_set.hpp
==============================================================================
--- trunk/boost/icl/concept/element_set.hpp (original)
+++ trunk/boost/icl/concept/element_set.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -60,13 +60,6 @@
//= Intersection
//==============================================================================
template<class Type>
-inline typename enable_if<is_element_set<Type>, Type>::type
-operator & (Type object, const Type& operand)
-{
- return object &= operand;
-}
-
-template<class Type>
inline typename enable_if<is_element_set<Type>, bool>::type
intersects(const Type& object, const typename Type::key_type& operand)
{

Modified: trunk/boost/icl/concept/interval_associator.hpp
==============================================================================
--- trunk/boost/icl/concept/interval_associator.hpp (original)
+++ trunk/boost/icl/concept/interval_associator.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -662,7 +662,7 @@
bool>::type
intersects(const Type& left, const CoType& right)
{
- return left.find(right) != left.end();
+ return icl::find(left, right) != left.end();
}

Modified: trunk/boost/icl/concept/interval_associator_base.hpp
==============================================================================
--- trunk/boost/icl/concept/interval_associator_base.hpp (original)
+++ trunk/boost/icl/concept/interval_associator_base.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -21,7 +21,7 @@
//==============================================================================
//= Selection<IntervalSet|IntervalMap>
//==============================================================================
-template<class Type>
+template<class Type> inline
typename enable_if<mpl::and_< is_interval_container<Type>
                             , is_discrete<typename domain_type_of<Type>::type>
>
@@ -33,7 +33,7 @@
     return object.find(icl::detail::unit_trail<interval_type>(key_val));
}

-template<class Type>
+template<class Type> inline
typename enable_if<mpl::and_< is_interval_container<Type>
                             , is_continuous<typename domain_type_of<Type>::type>
                             , has_dynamic_bounds<typename interval_type_of<Type>::type>
@@ -46,7 +46,7 @@
     return object.find(icl::singleton<interval_type>(key_val));
}

-template<class Type>
+template<class Type> inline
typename enable_if<mpl::and_< is_interval_container<Type>
                             , is_continuous<typename domain_type_of<Type>::type>
                             , is_static_right_open<typename interval_type_of<Type>::type>
@@ -66,7 +66,7 @@
             : object.end();
}

-template<class Type>
+template<class Type> inline
typename enable_if<mpl::and_< is_interval_container<Type>
                             , is_continuous<typename domain_type_of<Type>::type>
                             , is_static_left_open<typename interval_type_of<Type>::type>
@@ -91,7 +91,7 @@
// NOTE: find(object, key) won't compile if key is of continuous type that does
// not implement in(de)crementation (e.g. std::string).

-template<class Type>
+template<class Type> inline
typename enable_if< is_interval_container<Type>
                   , typename Type::const_iterator>::type
find(const Type& object, const typename interval_type_of<Type>::type& inter_val)

Modified: trunk/boost/icl/concept/interval_map.hpp
==============================================================================
--- trunk/boost/icl/concept/interval_map.hpp (original)
+++ trunk/boost/icl/concept/interval_map.hpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -102,7 +102,7 @@
             , bool>::type
contains(const Type& super, const typename Type::domain_type& key)
{
- return super.find(key) != super.end();
+ return icl::find(super, key) != super.end();
}

template<class Type>
@@ -372,7 +372,7 @@
     typedef typename Type::segment_type segment_type;
     typedef typename Type::const_iterator const_iterator;

- const_iterator it_ = object.find(key_value);
+ const_iterator it_ = icl::find(object, key_value);
     if(it_ != object.end())
         add(section, segment_type(interval_type(key_value),it_->second));
}

Modified: trunk/libs/icl/test/fastest_icl_map_/fastest_icl_map.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_icl_map_/fastest_icl_map.cpp (original)
+++ trunk/libs/icl/test/fastest_icl_map_/fastest_icl_map.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,13 +15,13 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <set>
#include <boost/icl/associative_element_container.hpp>
#include <boost/icl/map.hpp>
#include <boost/icl/interval_map.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp (original)
+++ trunk/libs/icl/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,11 +15,11 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp (original)
+++ trunk/libs/icl/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,11 +15,11 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set.cpp (original)
+++ trunk/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,7 +15,6 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <set>
#include <boost/icl/associative_element_container.hpp>
@@ -23,6 +22,7 @@
#include <boost/icl/separate_interval_set.hpp>
#include <boost/icl/split_interval_set.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_set_interval_set_/fastest_set_interval_set.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_set_interval_set_/fastest_set_interval_set.cpp (original)
+++ trunk/libs/icl/test/fastest_set_interval_set_/fastest_set_interval_set.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,12 +15,12 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_set.hpp>
#include <boost/icl/separate_interval_set.hpp>
#include <boost/icl/split_interval_set.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp (original)
+++ trunk/libs/icl/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp (original)
+++ trunk/libs/icl/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp
==============================================================================
--- trunk/libs/icl/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp (original)
+++ trunk/libs/icl/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -21,7 +21,6 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/type_traits/is_same.hpp>

@@ -34,6 +33,7 @@

#include <boost/icl/detail/interval_morphism.hpp>
#include <boost/icl/interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_doc_code_/test_doc_code.cpp
==============================================================================
--- trunk/libs/icl/test/test_doc_code_/test_doc_code.cpp (original)
+++ trunk/libs/icl/test/test_doc_code_/test_doc_code.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -21,7 +21,6 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/type_traits/is_same.hpp>

@@ -29,6 +28,7 @@

#include <boost/icl/detail/interval_morphism.hpp>
#include <boost/icl/interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_icl_map_/test_icl_map.cpp
==============================================================================
--- trunk/libs/icl/test/test_icl_map_/test_icl_map.cpp (original)
+++ trunk/libs/icl/test/test_icl_map_/test_icl_map.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,11 +15,11 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/map.hpp>
#include <boost/icl/interval_map.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_misc_/test_misc.cpp
==============================================================================
--- trunk/libs/icl/test/test_misc_/test_misc.cpp (original)
+++ trunk/libs/icl/test/test_misc_/test_misc.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -16,7 +16,6 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/type_traits/is_same.hpp>
#include <boost/icl/rational.hpp>
@@ -24,6 +23,7 @@
#include <boost/icl/detail/interval_morphism.hpp>
#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_set.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp (original)
+++ trunk/libs/icl/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp (original)
+++ trunk/libs/icl/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_set_icl_set_/test_set_icl_set.cpp
==============================================================================
--- trunk/libs/icl/test/test_set_icl_set_/test_set_icl_set.cpp (original)
+++ trunk/libs/icl/test/test_set_icl_set_/test_set_icl_set.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,7 +15,6 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <set>
#include <boost/interprocess/containers/set.hpp>
@@ -25,6 +24,7 @@
#include <boost/icl/separate_interval_set.hpp>
#include <boost/icl/split_interval_set.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_set_interval_set_/test_set_interval_set.cpp
==============================================================================
--- trunk/libs/icl/test/test_set_interval_set_/test_set_interval_set.cpp (original)
+++ trunk/libs/icl/test/test_set_interval_set_/test_set_interval_set.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,12 +15,12 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_set.hpp>
#include <boost/icl/separate_interval_set.hpp>
#include <boost/icl/split_interval_set.hpp>
#include <boost/icl/detail/interval_morphism.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp (original)
+++ trunk/libs/icl/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp
==============================================================================
--- trunk/libs/icl/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp (original)
+++ trunk/libs/icl/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -15,10 +15,10 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/icl/interval_map.hpp>
#include <boost/icl/split_interval_map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

Modified: trunk/libs/icl/test/test_type_traits_/test_type_traits.cpp
==============================================================================
--- trunk/libs/icl/test/test_type_traits_/test_type_traits.cpp (original)
+++ trunk/libs/icl/test/test_type_traits_/test_type_traits.cpp 2011-03-13 14:39:06 EDT (Sun, 13 Mar 2011)
@@ -20,13 +20,13 @@
// interval instance types
#include "../test_type_lists.hpp"
#include "../test_value_maker.hpp"
-#include "../test_laws.hpp"

#include <boost/type_traits/is_same.hpp>

#include <boost/icl/rational.hpp>
#include <boost/icl/interval_map.hpp>
#include <boost/icl/map.hpp>
+#include "../test_laws.hpp"

using namespace std;
using namespace boost;

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