|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66103 - in sandbox/itl: boost/itl boost/itl/concept boost/itl/concept/interval boost/itl/detail boost/itl/type_traits boost/itl_xt boost/itl_xt/detail boost/itl_xt/std boost/validate boost/validate/driver boost/validate/gentor boost/validate/itl boost/validate/laws boost/validate/type boost/validate/validater libs/itl/doxy_doc/doxygen_input/pages libs/itl/example/boost_party_ libs/itl/example/interval_container_ libs/itl/example/large_bitset_ libs/itl/test libs/itl/test/fastest_itl_interval_ libs/itl/test/fastest_itl_map_ libs/itl/test/fastest_set_interval_set_ libs/itl/test/fastest_set_itl_set_ libs/itl/test/test_casual_ libs/itl/test/test_itl_interval_ libs/itl/test/test_itl_map_ libs/itl/test/test_set_interval_set_ libs/itl/test/test_set_itl_set_ libs/itl_xt/example/history_ libs/validate/example/labat_polygon_
From: afojgo_at_[hidden]
Date: 2010-10-19 13:53:47
Author: jofaber
Date: 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
New Revision: 66103
URL: http://svn.boost.org/trac/boost/changeset/66103
Log:
Replaces ITL all by ICL in all macros. Stable{msvc-9.0, 10.0, gcc-3.4.4}
Text files modified:
sandbox/itl/boost/itl/closed_interval.hpp | 14 +-
sandbox/itl/boost/itl/concept/comparable.hpp | 4
sandbox/itl/boost/itl/concept/container.hpp | 4
sandbox/itl/boost/itl/concept/element_associator.hpp | 12 +-
sandbox/itl/boost/itl/concept/element_map.hpp | 14 +-
sandbox/itl/boost/itl/concept/element_set.hpp | 6
sandbox/itl/boost/itl/concept/element_set_value.hpp | 4
sandbox/itl/boost/itl/concept/interval.hpp | 4
sandbox/itl/boost/itl/concept/interval/base.hpp | 4
sandbox/itl/boost/itl/concept/interval_associator.hpp | 14 +-
sandbox/itl/boost/itl/concept/interval_bounds.hpp | 4
sandbox/itl/boost/itl/concept/interval_map.hpp | 10
sandbox/itl/boost/itl/concept/interval_set.hpp | 6
sandbox/itl/boost/itl/concept/interval_set_value.hpp | 4
sandbox/itl/boost/itl/concept/map_value.hpp | 4
sandbox/itl/boost/itl/concept/set_value.hpp | 4
sandbox/itl/boost/itl/continuous_interval.hpp | 20 +-
sandbox/itl/boost/itl/detail/associated_value.hpp | 4
sandbox/itl/boost/itl/detail/concept_check.hpp | 4
sandbox/itl/boost/itl/detail/design_config.hpp | 160 +++++++++++++-------------
sandbox/itl/boost/itl/detail/element_comparer.hpp | 4
sandbox/itl/boost/itl/detail/element_iterator.hpp | 66 +++++-----
sandbox/itl/boost/itl/detail/exclusive_less_than.hpp | 4
sandbox/itl/boost/itl/detail/interval_map_algo.hpp | 4
sandbox/itl/boost/itl/detail/interval_morphism.hpp | 14 +-
sandbox/itl/boost/itl/detail/interval_set_algo.hpp | 4
sandbox/itl/boost/itl/detail/interval_subset_comparer.hpp | 4
sandbox/itl/boost/itl/detail/map_algo.hpp | 4
sandbox/itl/boost/itl/detail/mapped_reference.hpp | 6
sandbox/itl/boost/itl/detail/notate.hpp | 16 +-
sandbox/itl/boost/itl/detail/on_absorbtion.hpp | 4
sandbox/itl/boost/itl/detail/relation_state.hpp | 6
sandbox/itl/boost/itl/detail/set_algo.hpp | 4
sandbox/itl/boost/itl/detail/std_set.hpp | 6
sandbox/itl/boost/itl/detail/subset_comparer.hpp | 4
sandbox/itl/boost/itl/discrete_interval.hpp | 20 +-
sandbox/itl/boost/itl/dynamic_interval_traits.hpp | 4
sandbox/itl/boost/itl/functors.hpp | 4
sandbox/itl/boost/itl/gregorian.hpp | 4
sandbox/itl/boost/itl/impl_config.hpp | 28 ++--
sandbox/itl/boost/itl/interval.hpp | 12 +-
sandbox/itl/boost/itl/interval_base_map.hpp | 66 +++++-----
sandbox/itl/boost/itl/interval_base_set.hpp | 36 +++---
sandbox/itl/boost/itl/interval_bounds.hpp | 4
sandbox/itl/boost/itl/interval_combining_style.hpp | 4
sandbox/itl/boost/itl/interval_map.hpp | 34 ++--
sandbox/itl/boost/itl/interval_set.hpp | 26 ++--
sandbox/itl/boost/itl/interval_traits.hpp | 4
sandbox/itl/boost/itl/iterator.hpp | 6
sandbox/itl/boost/itl/left_open_interval.hpp | 16 +-
sandbox/itl/boost/itl/map.hpp | 48 ++++----
sandbox/itl/boost/itl/open_interval.hpp | 16 +-
sandbox/itl/boost/itl/predicates.hpp | 4
sandbox/itl/boost/itl/ptime.hpp | 4
sandbox/itl/boost/itl/rational.hpp | 4
sandbox/itl/boost/itl/right_open_interval.hpp | 16 +-
sandbox/itl/boost/itl/separate_interval_set.hpp | 24 ++--
sandbox/itl/boost/itl/set.hpp | 24 ++--
sandbox/itl/boost/itl/split_interval_map.hpp | 30 ++--
sandbox/itl/boost/itl/split_interval_set.hpp | 20 +-
sandbox/itl/boost/itl/type_traits/absorbs_identities.hpp | 4
sandbox/itl/boost/itl/type_traits/adds_inversely.hpp | 6
sandbox/itl/boost/itl/type_traits/codomain_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/difference.hpp | 4
sandbox/itl/boost/itl/type_traits/difference_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/domain_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/element_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/has_inverse.hpp | 6
sandbox/itl/boost/itl/type_traits/has_set_semantics.hpp | 4
sandbox/itl/boost/itl/type_traits/identity_element.hpp | 4
sandbox/itl/boost/itl/type_traits/infinity.hpp | 4
sandbox/itl/boost/itl/type_traits/interval_type_default.hpp | 8
sandbox/itl/boost/itl/type_traits/interval_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_associative_element_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_asymmetric_interval.hpp | 4
sandbox/itl/boost/itl/type_traits/is_combinable.hpp | 4
sandbox/itl/boost/itl/type_traits/is_concept_equivalent.hpp | 4
sandbox/itl/boost/itl/type_traits/is_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_continuous.hpp | 4
sandbox/itl/boost/itl/type_traits/is_continuous_interval.hpp | 4
sandbox/itl/boost/itl/type_traits/is_discrete.hpp | 4
sandbox/itl/boost/itl/type_traits/is_discrete_interval.hpp | 4
sandbox/itl/boost/itl/type_traits/is_element_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_icl_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_interval.hpp | 4
sandbox/itl/boost/itl/type_traits/is_interval_container.hpp | 4
sandbox/itl/boost/itl/type_traits/is_interval_joiner.hpp | 4
sandbox/itl/boost/itl/type_traits/is_interval_separator.hpp | 4
sandbox/itl/boost/itl/type_traits/is_interval_splitter.hpp | 4
sandbox/itl/boost/itl/type_traits/is_key_container_of.hpp | 4
sandbox/itl/boost/itl/type_traits/is_map.hpp | 4
sandbox/itl/boost/itl/type_traits/is_numeric.hpp | 4
sandbox/itl/boost/itl/type_traits/is_set.hpp | 4
sandbox/itl/boost/itl/type_traits/is_total.hpp | 4
sandbox/itl/boost/itl/type_traits/no_type.hpp | 4
sandbox/itl/boost/itl/type_traits/segment_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/size.hpp | 4
sandbox/itl/boost/itl/type_traits/size_type_of.hpp | 4
sandbox/itl/boost/itl/type_traits/succ_pred.hpp | 4
sandbox/itl/boost/itl/type_traits/to_string.hpp | 4
sandbox/itl/boost/itl/type_traits/type_to_string.hpp | 4
sandbox/itl/boost/itl/type_traits/unit_element.hpp | 4
sandbox/itl/boost/itl/type_traits/value_size.hpp | 4
sandbox/itl/boost/itl_xt/bits.hpp | 6
sandbox/itl/boost/itl_xt/bits_gentor.hpp | 4
sandbox/itl/boost/itl_xt/detail/bit_element_iterator.hpp | 8
sandbox/itl/boost/itl_xt/enum_bitset.hpp | 6
sandbox/itl/boost/itl_xt/episode_product.hpp | 10
sandbox/itl/boost/itl_xt/episode_set.hpp | 10
sandbox/itl/boost/itl_xt/fixtupelconst.hpp | 6
sandbox/itl/boost/itl_xt/interval_bitset.hpp | 68 +++++-----
sandbox/itl/boost/itl_xt/list.hpp | 40 +++---
sandbox/itl/boost/itl_xt/map_segment_gentor.hpp | 6
sandbox/itl/boost/itl_xt/mapgentor.hpp | 14 +-
sandbox/itl/boost/itl_xt/meta_log.hpp | 6
sandbox/itl/boost/itl_xt/prefix_set.hpp | 6
sandbox/itl/boost/itl_xt/seqgentor.hpp | 8
sandbox/itl/boost/itl_xt/setgentor.hpp | 8
sandbox/itl/boost/itl_xt/std/pair.hpp | 6
sandbox/itl/boost/itl_xt/std/pair_gentor.hpp | 4
sandbox/itl/boost/itl_xt/string_list.hpp | 4
sandbox/itl/boost/itl_xt/string_map.hpp | 6
sandbox/itl/boost/itl_xt/string_set.hpp | 12 +-
sandbox/itl/boost/itl_xt/string_sheet.cpp | 2
sandbox/itl/boost/itl_xt/string_sheet.hpp | 6
sandbox/itl/boost/itl_xt/stringpattern_set.hpp | 6
sandbox/itl/boost/itl_xt/tuple_computer.hpp | 20 +-
sandbox/itl/boost/itl_xt/typed_episode.hpp | 6
sandbox/itl/boost/itl_xt/var_permutation.hpp | 2
sandbox/itl/boost/itl_xt/var_tuple_order.hpp | 4
sandbox/itl/boost/validate/driver/abelian_monoid_driver.hpp | 8
sandbox/itl/boost/validate/driver/bit_collector_driver.hpp | 8
sandbox/itl/boost/validate/driver/collector_driver.hpp | 8
sandbox/itl/boost/validate/driver/interval_bitset_driver.hpp | 2
sandbox/itl/boost/validate/driver/itl_driver.hpp | 16 +-
sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp | 8
sandbox/itl/boost/validate/driver/itl_relations_driver.hpp | 16 +-
sandbox/itl/boost/validate/driver/itl_set_driver.hpp | 16 +-
sandbox/itl/boost/validate/driver/itl_single_law_driver.hpp | 16 +-
sandbox/itl/boost/validate/driver/map_copy_conformity_driver.hpp | 8
sandbox/itl/boost/validate/driver/map_order_driver.hpp | 20 +-
sandbox/itl/boost/validate/driver/set_copy_conformity_driver.hpp | 8
sandbox/itl/boost/validate/driver/set_order_driver.hpp | 10
sandbox/itl/boost/validate/driver/signed_quantifier_driver.hpp | 8
sandbox/itl/boost/validate/driver/sorted_associative_bitset_back_driver.hpp | 2
sandbox/itl/boost/validate/driver/sorted_associative_bitset_driver.hpp | 2
sandbox/itl/boost/validate/driver/sorted_associative_map_back_driver.hpp | 6
sandbox/itl/boost/validate/driver/sorted_associative_map_driver.hpp | 6
sandbox/itl/boost/validate/driver/sorted_associative_set_back_driver.hpp | 2
sandbox/itl/boost/validate/driver/sorted_associative_set_driver.hpp | 2
sandbox/itl/boost/validate/driver/unsigned_quantifier_driver.hpp | 8
sandbox/itl/boost/validate/gentor/randomgentor.hpp | 134 +++++++++++-----------
sandbox/itl/boost/validate/itl/functors.hpp | 12 +-
sandbox/itl/boost/validate/laws/algo_equivalence.hpp | 6
sandbox/itl/boost/validate/laws/element_order.hpp | 6
sandbox/itl/boost/validate/laws/function_equality.hpp | 6
sandbox/itl/boost/validate/laws/induced_relation.hpp | 6
sandbox/itl/boost/validate/laws/inversion_laws.hpp | 6
sandbox/itl/boost/validate/laws/law.hpp | 6
sandbox/itl/boost/validate/laws/law_violations.hpp | 10
sandbox/itl/boost/validate/laws/map_laws.hpp | 6
sandbox/itl/boost/validate/laws/minor_set_laws.hpp | 6
sandbox/itl/boost/validate/laws/monoid.hpp | 6
sandbox/itl/boost/validate/laws/order.hpp | 6
sandbox/itl/boost/validate/laws/pushouts.hpp | 6
sandbox/itl/boost/validate/laws/set_laws.hpp | 6
sandbox/itl/boost/validate/laws/subset_order.hpp | 6
sandbox/itl/boost/validate/laws/symmetric_difference.hpp | 6
sandbox/itl/boost/validate/type/bits.hpp | 6
sandbox/itl/boost/validate/type/nat.hpp | 2
sandbox/itl/boost/validate/utility.hpp | 2
sandbox/itl/boost/validate/validater/abelian_monoid_validater.hpp | 6
sandbox/itl/boost/validate/validater/collector_validater.hpp | 6
sandbox/itl/boost/validate/validater/concept_validater.hpp | 6
sandbox/itl/boost/validate/validater/itl_induced_relations.hpp | 6
sandbox/itl/boost/validate/validater/itl_set_validater.hpp | 6
sandbox/itl/boost/validate/validater/monoid_validater.hpp | 6
sandbox/itl/boost/validate/validater/signed_quantifier_validater.hpp | 6
sandbox/itl/boost/validate/validater/unsigned_quantifier_validater.hpp | 6
sandbox/itl/boost/validate/validation_counts.hpp | 6
sandbox/itl/libs/itl/doxy_doc/doxygen_input/pages/doxygen_mainpage.hpp | 6
sandbox/itl/libs/itl/example/boost_party_/boost_party.cpp | 2
sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp | 2
sandbox/itl/libs/itl/example/large_bitset_/bits.hpp | 4
sandbox/itl/libs/itl/example/large_bitset_/large_bitset.hpp | 20 +-
sandbox/itl/libs/itl/test/fastest_interval_map_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_interval_map_infix_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_interval_set_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_interval_set_infix_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_itl_interval_/fastest_itl_interval.cpp | 6
sandbox/itl/libs/itl/test/fastest_itl_map_/fastest_itl_map_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_set_interval_set_/fastest_set_interval_set_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_set_itl_set_/fastest_set_itl_set_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_total_icl_quantifier_cases.hpp | 6
sandbox/itl/libs/itl/test/fastest_total_interval_quantifier_cases.hpp | 6
sandbox/itl/libs/itl/test/test_casual_/test_casual.cpp | 8
sandbox/itl/libs/itl/test/test_functions.hpp | 28 ++--
sandbox/itl/libs/itl/test/test_icl_continuous_interval.hpp | 12 +-
sandbox/itl/libs/itl/test/test_icl_discrete_interval.hpp | 8
sandbox/itl/libs/itl/test/test_icl_dynamic_interval.hpp | 6
sandbox/itl/libs/itl/test/test_icl_interval.hpp | 6
sandbox/itl/libs/itl/test/test_icl_quantifier_shared.hpp | 106 +++++++++---------
sandbox/itl/libs/itl/test/test_icl_static_interval.hpp | 6
sandbox/itl/libs/itl/test/test_interval_laws.hpp | 6
sandbox/itl/libs/itl/test/test_interval_map_cases.hpp | 6
sandbox/itl/libs/itl/test/test_interval_map_infix_cases.hpp | 6
sandbox/itl/libs/itl/test/test_interval_map_shared.hpp | 230 ++++++++++++++++++++--------------------
sandbox/itl/libs/itl/test/test_interval_quantifier_shared.hpp | 90 +++++++-------
sandbox/itl/libs/itl/test/test_interval_set_cases.hpp | 6
sandbox/itl/libs/itl/test/test_interval_set_infix_cases.hpp | 6
sandbox/itl/libs/itl/test/test_interval_set_laws_shared.hpp | 48 ++++----
sandbox/itl/libs/itl/test/test_interval_set_shared.hpp | 108 +++++++++---------
sandbox/itl/libs/itl/test/test_itl_interval.hpp | 4
sandbox/itl/libs/itl/test/test_itl_interval_/test_itl_interval.cpp | 4
sandbox/itl/libs/itl/test/test_itl_interval_shared.hpp | 14 +-
sandbox/itl/libs/itl/test/test_itl_map.hpp | 30 ++--
sandbox/itl/libs/itl/test/test_itl_map_/test_itl_map_cases.hpp | 6
sandbox/itl/libs/itl/test/test_laws.hpp | 4
sandbox/itl/libs/itl/test/test_partial_interval_quantifier_cases.hpp | 6
sandbox/itl/libs/itl/test/test_quantifier_itl_map.hpp | 80 ++++++------
sandbox/itl/libs/itl/test/test_quantifier_map_shared.hpp | 80 ++++++------
sandbox/itl/libs/itl/test/test_set_interval_set_/test_set_interval_set_cases.hpp | 6
sandbox/itl/libs/itl/test/test_set_interval_set_shared.hpp | 42 +++---
sandbox/itl/libs/itl/test/test_set_itl_set.hpp | 30 ++--
sandbox/itl/libs/itl/test/test_set_itl_set_/test_set_itl_set_cases.hpp | 6
sandbox/itl/libs/itl/test/test_set_itl_set_cases.hpp | 6
sandbox/itl/libs/itl/test/test_total_interval_quantifier_cases.hpp | 6
sandbox/itl/libs/itl/test/test_type_lists.hpp | 4
sandbox/itl/libs/itl/test/test_value_maker.hpp | 4
sandbox/itl/libs/itl/test/unit_test_unwarned.hpp | 6
sandbox/itl/libs/itl_xt/example/history_/history.cpp | 2
sandbox/itl/libs/validate/example/labat_polygon_/polygon_gentor.hpp | 12 +-
sandbox/itl/libs/validate/example/labat_polygon_/polygon_laws.hpp | 6
234 files changed, 1499 insertions(+), 1499 deletions(-)
Modified: sandbox/itl/boost/itl/closed_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/closed_interval.hpp (original)
+++ sandbox/itl/boost/itl/closed_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CLOSED_INTERVAL_HPP_JOFA_100324
-#define BOOST_ITL_CLOSED_INTERVAL_HPP_JOFA_100324
+#ifndef BOOST_ICL_CLOSED_INTERVAL_HPP_JOFA_100324
+#define BOOST_ICL_CLOSED_INTERVAL_HPP_JOFA_100324
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/type_traits/type_to_string.hpp>
@@ -16,7 +16,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class closed_interval
{
public:
@@ -70,11 +70,11 @@
//==============================================================================
//=T closed_interval -> concept intervals
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::closed_interval<DomainT, Compare> >
{
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::closed_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -89,14 +89,14 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< closed_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::static_closed);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::closed_interval<DomainT,Compare> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/concept/comparable.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/comparable.hpp (original)
+++ sandbox/itl/boost/itl/concept/comparable.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_COMPARABLE_HPP_JOFA_100921
-#define BOOST_ITL_CONCEPT_COMPARABLE_HPP_JOFA_100921
+#ifndef BOOST_ICL_CONCEPT_COMPARABLE_HPP_JOFA_100921
+#define BOOST_ICL_CONCEPT_COMPARABLE_HPP_JOFA_100921
#include <boost/itl/type_traits/is_icl_container.hpp>
Modified: sandbox/itl/boost/itl/concept/container.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/container.hpp (original)
+++ sandbox/itl/boost/itl/concept/container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_CONTAINER_HPP_JOFA_100923
-#define BOOST_ITL_CONCEPT_CONTAINER_HPP_JOFA_100923
+#ifndef BOOST_ICL_CONCEPT_CONTAINER_HPP_JOFA_100923
+#define BOOST_ICL_CONCEPT_CONTAINER_HPP_JOFA_100923
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/and.hpp>
Modified: sandbox/itl/boost/itl/concept/element_associator.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/element_associator.hpp (original)
+++ sandbox/itl/boost/itl/concept/element_associator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_ELEMENT_ASSOCIATOR_HPP_JOFA_100921
-#define BOOST_ITL_CONCEPT_ELEMENT_ASSOCIATOR_HPP_JOFA_100921
+#ifndef BOOST_ICL_CONCEPT_ELEMENT_ASSOCIATOR_HPP_JOFA_100921
+#define BOOST_ICL_CONCEPT_ELEMENT_ASSOCIATOR_HPP_JOFA_100921
#include <boost/itl/type_traits/is_associative_element_container.hpp>
#include <boost/itl/type_traits/is_key_container_of.hpp>
@@ -193,7 +193,7 @@
return object;
typename Type::iterator prior_ = object.end();
- ITL_const_FORALL(typename Type, it_, operand)
+ ICL_const_FORALL(typename Type, it_, operand)
prior_ = icl::add(object, prior_, *it_);
return object;
@@ -276,7 +276,7 @@
typedef typename Type::iterator iterator;
iterator prior_ = object.end();
- ITL_const_FORALL(typename Type, elem_, addend)
+ ICL_const_FORALL(typename Type, elem_, addend)
icl::insert(object, prior_, *elem_);
return object;
@@ -304,7 +304,7 @@
typename enable_if<is_associative_element_container<Type>, Type>::type&
erase(Type& object, const Type& erasure)
{
- ITL_const_FORALL(typename Type, elem_, erasure)
+ ICL_const_FORALL(typename Type, elem_, erasure)
icl::erase(object, *elem_);
return object;
@@ -333,7 +333,7 @@
inline typename enable_if<is_associative_element_container<Type>, Type>::type&
operator -= (Type& object, const Type& subtrahend)
{
- ITL_const_FORALL(typename Type, it_, subtrahend)
+ ICL_const_FORALL(typename Type, it_, subtrahend)
icl::subtract(object, *it_);
return object;
Modified: sandbox/itl/boost/itl/concept/element_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/element_map.hpp (original)
+++ sandbox/itl/boost/itl/concept/element_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_ELEMENT_MAP_HPP_JOFA_100921
-#define BOOST_ITL_CONCEPT_ELEMENT_MAP_HPP_JOFA_100921
+#ifndef BOOST_ICL_CONCEPT_ELEMENT_MAP_HPP_JOFA_100921
+#define BOOST_ICL_CONCEPT_ELEMENT_MAP_HPP_JOFA_100921
#include <boost/mpl/and.hpp>
#include <boost/mpl/not.hpp>
@@ -123,7 +123,7 @@
erase(Type& object, const typename Type::set_type& erasure)
{
typedef typename Type::set_type set_type;
- ITL_const_FORALL(typename set_type, elem_, erasure)
+ ICL_const_FORALL(typename set_type, elem_, erasure)
icl::erase(object, *elem_);
return object;
@@ -223,7 +223,7 @@
inline typename enable_if<is_element_map<Type>, void>::type
add_intersection(Type& section, const Type& object, const Type& operand)
{
- ITL_const_FORALL(typename Type, it_, operand)
+ ICL_const_FORALL(typename Type, it_, operand)
icl::add_intersection(section, object, *it_);
}
@@ -397,10 +397,10 @@
, Type>::type&
operator ^= (Type& object, const Type& operand)
{
- ITL_const_FORALL(typename Type, it_, operand)
+ ICL_const_FORALL(typename Type, it_, operand)
icl::flip(object, *it_);
- ITL_FORALL(typename Type, it2_, object)
+ ICL_FORALL(typename Type, it2_, object)
it2_->second = identity_element<typename Type::codomain_type>::value();
return object;
@@ -473,7 +473,7 @@
operator << (std::basic_ostream<CharType, CharTraits>& stream, const Type& object)
{
stream << "{";
- ITL_const_FORALL(typename Type, it, object)
+ ICL_const_FORALL(typename Type, it, object)
stream << "(" << it->first << "->" << it->second << ")";
return stream << "}";
Modified: sandbox/itl/boost/itl/concept/element_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/element_set.hpp (original)
+++ sandbox/itl/boost/itl/concept/element_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_ELEMENT_SET_HPP_JOFA_100921
-#define BOOST_ITL_CONCEPT_ELEMENT_SET_HPP_JOFA_100921
+#ifndef BOOST_ICL_CONCEPT_ELEMENT_SET_HPP_JOFA_100921
+#define BOOST_ICL_CONCEPT_ELEMENT_SET_HPP_JOFA_100921
#include <boost/itl/type_traits/is_combinable.hpp>
#include <boost/itl/concept/set_value.hpp>
@@ -126,7 +126,7 @@
operator << (std::basic_ostream<CharType, CharTraits>& stream, const Type& object)
{
stream << "{";
- ITL_const_FORALL(typename Type, it, object)
+ ICL_const_FORALL(typename Type, it, object)
stream << *it << " ";
return stream << "}";
Modified: sandbox/itl/boost/itl/concept/element_set_value.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/element_set_value.hpp (original)
+++ sandbox/itl/boost/itl/concept/element_set_value.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_ELEMENT_SET_VALUE_HPP_JOFA_100924
-#define BOOST_ITL_CONCEPT_ELEMENT_SET_VALUE_HPP_JOFA_100924
+#ifndef BOOST_ICL_CONCEPT_ELEMENT_SET_VALUE_HPP_JOFA_100924
+#define BOOST_ICL_CONCEPT_ELEMENT_SET_VALUE_HPP_JOFA_100924
#include <boost/itl/type_traits/is_element_container.hpp>
Modified: sandbox/itl/boost/itl/concept/interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_HPP_JOFA_100323
-#define BOOST_ITL_CONCEPT_INTERVAL_HPP_JOFA_100323
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_HPP_JOFA_100323
+#define BOOST_ICL_CONCEPT_INTERVAL_HPP_JOFA_100323
#include <boost/assert.hpp>
#include <boost/utility/enable_if.hpp>
Modified: sandbox/itl/boost/itl/concept/interval/base.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval/base.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval/base.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
-#define BOOST_ITL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
+#define BOOST_ICL_CONCEPT_INTERVAL_BASE_HPP_JOFA_100920
#include <boost/itl/type_traits/is_combinable.hpp>
Modified: sandbox/itl/boost/itl/concept/interval_associator.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval_associator.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval_associator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_ASSOCIATOR_HPP_JOFA_100920
-#define BOOST_ITL_CONCEPT_INTERVAL_ASSOCIATOR_HPP_JOFA_100920
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_ASSOCIATOR_HPP_JOFA_100920
+#define BOOST_ICL_CONCEPT_INTERVAL_ASSOCIATOR_HPP_JOFA_100920
#include <boost/itl/type_traits/domain_type_of.hpp>
#include <boost/itl/type_traits/interval_type_of.hpp>
@@ -124,7 +124,7 @@
typedef typename Type::interval_type interval_type;
size_type size = identity_element<size_type>::value();
- ITL_const_FORALL(typename Type, it, object)
+ ICL_const_FORALL(typename Type, it, object)
size += icl::cardinality(key_value<Type>(it));
return size;
@@ -143,7 +143,7 @@
size_type size = identity_element<size_type>::value();
size_type interval_size;
- ITL_const_FORALL(typename Type, it, object)
+ ICL_const_FORALL(typename Type, it, object)
{
interval_size = icl::cardinality(key_value<Type>(it));
if(interval_size == infinity<size_type>::value())
@@ -294,7 +294,7 @@
operator += (Type& object, const OperandT& operand)
{
typename Type::iterator prior_ = object.end();
- ITL_const_FORALL(typename OperandT, elem_, operand)
+ ICL_const_FORALL(typename OperandT, elem_, operand)
prior_ = icl::add(object, prior_, *elem_);
return object;
@@ -433,7 +433,7 @@
insert(Type& object, const OperandT& operand)
{
typename Type::iterator prior_ = object.end();
- ITL_const_FORALL(typename OperandT, elem_, operand)
+ ICL_const_FORALL(typename OperandT, elem_, operand)
insert(object, *elem_);
return object;
@@ -499,7 +499,7 @@
Type>::type&
operator -=(Type& object, const OperandT& operand)
{
- ITL_const_FORALL(typename OperandT, elem_, operand)
+ ICL_const_FORALL(typename OperandT, elem_, operand)
icl::subtract(object, *elem_);
return object;
Modified: sandbox/itl/boost/itl/concept/interval_bounds.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval_bounds.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval_bounds.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_BOUNDS_HPP_JOFA_100927
-#define BOOST_ITL_CONCEPT_INTERVAL_BOUNDS_HPP_JOFA_100927
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_BOUNDS_HPP_JOFA_100927
+#define BOOST_ICL_CONCEPT_INTERVAL_BOUNDS_HPP_JOFA_100927
#include <boost/itl/interval_bounds.hpp>
#include <boost/itl/type_traits/is_discrete.hpp>
Modified: sandbox/itl/boost/itl/concept/interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval_map.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_MAP_HPP_JOFA_100920
-#define BOOST_ITL_CONCEPT_INTERVAL_MAP_HPP_JOFA_100920
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_MAP_HPP_JOFA_100920
+#define BOOST_ICL_CONCEPT_INTERVAL_MAP_HPP_JOFA_100920
#include <boost/itl/type_traits/element_type_of.hpp>
#include <boost/itl/type_traits/segment_type_of.hpp>
@@ -505,7 +505,7 @@
typedef typename Type::codomain_type codomain_type;
object += operand;
- ITL_FORALL(typename Type, it_, object)
+ ICL_FORALL(typename Type, it_, object)
it_->second = identity_element<codomain_type>::value();
if(mpl::not_<is_interval_splitter<Type> >::value)
@@ -561,7 +561,7 @@
domain(SetT& result, const Type& object)
{
result.clear();
- ITL_const_FORALL(typename Type, it_, object)
+ ICL_const_FORALL(typename Type, it_, object)
result += it_->first;
return result;
@@ -632,7 +632,7 @@
operator << (std::basic_ostream<CharType, CharTraits>& stream, const Type& object)
{
stream << "{";
- ITL_const_FORALL(typename Type, it_, object)
+ ICL_const_FORALL(typename Type, it_, object)
stream << "(" << it_->first << "->" << it_->second << ")";
return stream << "}";
Modified: sandbox/itl/boost/itl/concept/interval_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval_set.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_SET_HPP_JOFA_100920
-#define BOOST_ITL_CONCEPT_INTERVAL_SET_HPP_JOFA_100920
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_SET_HPP_JOFA_100920
+#define BOOST_ICL_CONCEPT_INTERVAL_SET_HPP_JOFA_100920
#include <boost/itl/type_traits/is_combinable.hpp>
#include <boost/itl/detail/set_algo.hpp>
@@ -299,7 +299,7 @@
operator << (std::basic_ostream<CharType, CharTraits>& stream, const Type& object)
{
stream << "{";
- ITL_const_FORALL(typename Type, it_, object)
+ ICL_const_FORALL(typename Type, it_, object)
stream << (*it_);
return stream << "}";
Modified: sandbox/itl/boost/itl/concept/interval_set_value.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/interval_set_value.hpp (original)
+++ sandbox/itl/boost/itl/concept/interval_set_value.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_INTERVAL_SET_VALUE_HPP_JOFA_100924
-#define BOOST_ITL_CONCEPT_INTERVAL_SET_VALUE_HPP_JOFA_100924
+#ifndef BOOST_ICL_CONCEPT_INTERVAL_SET_VALUE_HPP_JOFA_100924
+#define BOOST_ICL_CONCEPT_INTERVAL_SET_VALUE_HPP_JOFA_100924
#include <boost/utility/enable_if.hpp>
#include <boost/itl/type_traits/is_interval_container.hpp>
Modified: sandbox/itl/boost/itl/concept/map_value.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/map_value.hpp (original)
+++ sandbox/itl/boost/itl/concept/map_value.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_MAP_VALUE_HPP_JOFA_100924
-#define BOOST_ITL_CONCEPT_MAP_VALUE_HPP_JOFA_100924
+#ifndef BOOST_ICL_CONCEPT_MAP_VALUE_HPP_JOFA_100924
+#define BOOST_ICL_CONCEPT_MAP_VALUE_HPP_JOFA_100924
#include <boost/itl/type_traits/is_map.hpp>
Modified: sandbox/itl/boost/itl/concept/set_value.hpp
==============================================================================
--- sandbox/itl/boost/itl/concept/set_value.hpp (original)
+++ sandbox/itl/boost/itl/concept/set_value.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_SET_VALUE_HPP_JOFA_100924
-#define BOOST_ITL_CONCEPT_SET_VALUE_HPP_JOFA_100924
+#ifndef BOOST_ICL_CONCEPT_SET_VALUE_HPP_JOFA_100924
+#define BOOST_ICL_CONCEPT_SET_VALUE_HPP_JOFA_100924
#include <boost/itl/type_traits/is_set.hpp>
Modified: sandbox/itl/boost/itl/continuous_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/continuous_interval.hpp (original)
+++ sandbox/itl/boost/itl/continuous_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONTINUOUS_INTERVAL_HPP_JOFA_100327
-#define BOOST_ITL_CONTINUOUS_INTERVAL_HPP_JOFA_100327
+#ifndef BOOST_ICL_CONTINUOUS_INTERVAL_HPP_JOFA_100327
+#define BOOST_ICL_CONTINUOUS_INTERVAL_HPP_JOFA_100327
#include <functional>
#include <boost/static_assert.hpp>
@@ -24,7 +24,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class continuous_interval
{
public:
@@ -87,12 +87,12 @@
//==============================================================================
//=T continuous_interval -> concept interval
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::continuous_interval<DomainT, Compare> >
{
typedef interval_traits type;
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::continuous_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -108,13 +108,13 @@
//==============================================================================
//=T continuous_interval -> concept dynamic_interval
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct dynamic_interval_traits<boost::icl::continuous_interval<DomainT,Compare> >
{
typedef dynamic_interval_traits type;
typedef boost::icl::continuous_interval<DomainT,Compare> interval_type;
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
static interval_type construct(const domain_type lo, const domain_type up, interval_bounds bounds)
{
@@ -137,21 +137,21 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< continuous_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::dynamic);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct is_continuous_interval<continuous_interval<DomainT,Compare> >
{
typedef is_continuous_interval<continuous_interval<DomainT,Compare> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::continuous_interval<DomainT,Compare> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/detail/associated_value.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/associated_value.hpp (original)
+++ sandbox/itl/boost/itl/detail/associated_value.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_ASSOCIATED_VALUE_HPP_JOFA_100829
-#define BOOST_ITL_DETAIL_ASSOCIATED_VALUE_HPP_JOFA_100829
+#ifndef BOOST_ICL_DETAIL_ASSOCIATED_VALUE_HPP_JOFA_100829
+#define BOOST_ICL_DETAIL_ASSOCIATED_VALUE_HPP_JOFA_100829
#include <boost/itl/detail/design_config.hpp>
#include <boost/itl/type_traits/is_combinable.hpp>
Modified: sandbox/itl/boost/itl/detail/concept_check.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/concept_check.hpp (original)
+++ sandbox/itl/boost/itl/detail/concept_check.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_CONCEPT_CHECK_HPP_JOFA_090913
-#define BOOST_ITL_CONCEPT_CHECK_HPP_JOFA_090913
+#ifndef BOOST_ICL_CONCEPT_CHECK_HPP_JOFA_090913
+#define BOOST_ICL_CONCEPT_CHECK_HPP_JOFA_090913
#include <boost/concept_check.hpp>
#include <boost/concept/detail/concept_def.hpp>
Modified: sandbox/itl/boost/itl/detail/design_config.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/design_config.hpp (original)
+++ sandbox/itl/boost/itl/detail/design_config.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,50 +12,50 @@
template type parameter
by setting defines in this file.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DESIGN_CONFIG_HPP_JOFA_090214
-#define BOOST_ITL_DESIGN_CONFIG_HPP_JOFA_090214
+#ifndef BOOST_ICL_DESIGN_CONFIG_HPP_JOFA_090214
+#define BOOST_ICL_DESIGN_CONFIG_HPP_JOFA_090214
// For an interim period, it will be possible to swith between the old and new
// implementation for intervals.
-#define ITL_NEW_INTERVAL_IMPL //JODO remove for the final release.
+#define ICL_NEW_INTERVAL_IMPL //JODO remove for the final release.
// If this macro is defined, right_open_interval with static interval borders
// will be used as default for all interval containers.
-// ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS should be defined in the application
+// ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS should be defined in the application
// before other includes from the ITL
-//#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS //JODO comment this out for the final release
-// If ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS is NOT defined, ITL uses intervals
+//#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS //JODO comment this out for the final release
+// If ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS is NOT defined, ITL uses intervals
// with dynamic borders as default.
-#ifdef ITL_USE_DYNAMIC_INTERVAL_BORDERS_DEFAULTS //JODO remove this for the final release
-# undef ITL_USE_STATIC_INTERVAL_BORDERS_DEFAULTS
+#ifdef ICL_USE_DYNAMIC_INTERVAL_BORDERS_DEFAULTS //JODO remove this for the final release
+# undef ICL_USE_STATIC_INTERVAL_BORDERS_DEFAULTS
#endif
-//#define ITL_CONCEPT_ORIENTED
-#define ITL_PURE_CONCEPTUAL
+//#define ICL_CONCEPT_ORIENTED
+#define ICL_PURE_CONCEPTUAL
-#ifndef ITL_CONCEPT_ORIENTED
-#define ITL_OBJECT_ORIENTED
+#ifndef ICL_CONCEPT_ORIENTED
+#define ICL_OBJECT_ORIENTED
#endif
-#ifdef ITL_CONCEPT_ORIENTED //CL
-# define ITL_FUN_CALL(func, arg) icl::func(arg)
-# define ITL_FUN_REN(func_obj, func_conc, arg) icl::func_conc(arg)
-#else //ITL_OBJECT_ORIENTED
-# define ITL_FUN_CALL(func,arg) arg.func()
-# define ITL_FUN_REN(func_obj, func_conc, arg) arg.func_obj()
+#ifdef ICL_CONCEPT_ORIENTED //CL
+# define ICL_FUN_CALL(func, arg) icl::func(arg)
+# define ICL_FUN_REN(func_obj, func_conc, arg) icl::func_conc(arg)
+#else //ICL_OBJECT_ORIENTED
+# define ICL_FUN_CALL(func,arg) arg.func()
+# define ICL_FUN_REN(func_obj, func_conc, arg) arg.func_obj()
#endif
-#ifdef ITL_OBJECT_ORIENTED //CL
-# define ITL_BEGIN_COMMON_MEMBER_FUNCTIONS public
-# define ITL_END_COMMON_MEMBER_FUNCTIONS public
-#else //ITL_CONCEPT_ORIENTED
-# ifdef ITL_PURE_CONCEPTUAL
-# define ITL_BEGIN_COMMON_MEMBER_FUNCTIONS private
-# define ITL_END_COMMON_MEMBER_FUNCTIONS public
+#ifdef ICL_OBJECT_ORIENTED //CL
+# define ICL_BEGIN_COMMON_MEMBER_FUNCTIONS public
+# define ICL_END_COMMON_MEMBER_FUNCTIONS public
+#else //ICL_CONCEPT_ORIENTED
+# ifdef ICL_PURE_CONCEPTUAL
+# define ICL_BEGIN_COMMON_MEMBER_FUNCTIONS private
+# define ICL_END_COMMON_MEMBER_FUNCTIONS public
# else
-# define ITL_BEGIN_COMMON_MEMBER_FUNCTIONS public
-# define ITL_END_COMMON_MEMBER_FUNCTIONS public
+# define ICL_BEGIN_COMMON_MEMBER_FUNCTIONS public
+# define ICL_END_COMMON_MEMBER_FUNCTIONS public
# endif
#endif
@@ -68,90 +68,90 @@
// (4) Being able to check template template parameter variants against
// template type parameter variants.
-#ifdef ITL_NEW_INTERVAL_IMPL
-# define ITL_USE_COMPARE_TEMPLATE_TEMPLATE
-# define ITL_USE_COMBINE_TEMPLATE_TEMPLATE
-# define ITL_USE_SECTION_TEMPLATE_TEMPLATE
+#ifdef ICL_NEW_INTERVAL_IMPL
+# define ICL_USE_COMPARE_TEMPLATE_TEMPLATE
+# define ICL_USE_COMBINE_TEMPLATE_TEMPLATE
+# define ICL_USE_SECTION_TEMPLATE_TEMPLATE
#else
-# define ITL_USE_COMPARE_TEMPLATE_TEMPLATE
-# define ITL_USE_COMBINE_TEMPLATE_TEMPLATE
-# define ITL_USE_SECTION_TEMPLATE_TEMPLATE
-# define ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
+# define ICL_USE_COMPARE_TEMPLATE_TEMPLATE
+# define ICL_USE_COMBINE_TEMPLATE_TEMPLATE
+# define ICL_USE_SECTION_TEMPLATE_TEMPLATE
+# define ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
#endif
-//#define ITL_USE_COMPARE_TEMPLATE_TYPE
-//#define ITL_USE_COMBINE_TEMPLATE_TYPE
-//#define ITL_USE_SECTION_TEMPLATE_TYPE
-//#define ITL_USE_INTERVAL_TEMPLATE_TYPE
+//#define ICL_USE_COMPARE_TEMPLATE_TYPE
+//#define ICL_USE_COMBINE_TEMPLATE_TYPE
+//#define ICL_USE_SECTION_TEMPLATE_TYPE
+//#define ICL_USE_INTERVAL_TEMPLATE_TYPE
//------------------------------------------------------------------------------
// template parameter Compare can not be a template type parameter as long as
// Compare<Interval<DomainT,Compare> >() is called in std::lexicographical_compare
// implementing operator< for interval_base_{set,map}. see NOTE DESIGN TTP
-#ifdef ITL_USE_COMPARE_TEMPLATE_TEMPLATE
-# define ITL_COMPARE template<class>class
-# define ITL_COMPARE_DOMAIN(itl_compare, domain_type) itl_compare<domain_type>
-# define ITL_COMPARE_INSTANCE(compare_instance, domain_type) compare_instance
-# define ITL_EXCLUSIVE_LESS(interval_type) exclusive_less_than
-#else//ITL_USE_COMPARE_TEMPLATE_TYPE
-# define ITL_COMPARE class
-# define ITL_COMPARE_DOMAIN(itl_compare, domain_type) itl_compare
-# define ITL_COMPARE_INSTANCE(compare_instance, domain_type) compare_instance<domain_type>
-# define ITL_EXCLUSIVE_LESS(interval_type) exclusive_less_than<interval_type>
+#ifdef ICL_USE_COMPARE_TEMPLATE_TEMPLATE
+# define ICL_COMPARE template<class>class
+# define ICL_COMPARE_DOMAIN(itl_compare, domain_type) itl_compare<domain_type>
+# define ICL_COMPARE_INSTANCE(compare_instance, domain_type) compare_instance
+# define ICL_EXCLUSIVE_LESS(interval_type) exclusive_less_than
+#else//ICL_USE_COMPARE_TEMPLATE_TYPE
+# define ICL_COMPARE class
+# define ICL_COMPARE_DOMAIN(itl_compare, domain_type) itl_compare
+# define ICL_COMPARE_INSTANCE(compare_instance, domain_type) compare_instance<domain_type>
+# define ICL_EXCLUSIVE_LESS(interval_type) exclusive_less_than<interval_type>
#endif
//------------------------------------------------------------------------------
// template parameter Combine could be a template type parameter.
-#ifdef ITL_USE_COMBINE_TEMPLATE_TEMPLATE
-# define ITL_COMBINE template<class>class
-# define ITL_COMBINE_CODOMAIN(itl_combine, codomain_type) itl_combine<codomain_type>
-# define ITL_COMBINE_INSTANCE(combine_instance,codomain_type) combine_instance
-#else//ITL_USE_COMBINE_TEMPLATE_TYPE
-# define ITL_COMBINE class
-# define ITL_COMBINE_CODOMAIN(itl_combine, codomain_type) itl_combine
-# define ITL_COMBINE_INSTANCE(combine_instance,codomain_type) combine_instance<codomain_type>
+#ifdef ICL_USE_COMBINE_TEMPLATE_TEMPLATE
+# define ICL_COMBINE template<class>class
+# define ICL_COMBINE_CODOMAIN(itl_combine, codomain_type) itl_combine<codomain_type>
+# define ICL_COMBINE_INSTANCE(combine_instance,codomain_type) combine_instance
+#else//ICL_USE_COMBINE_TEMPLATE_TYPE
+# define ICL_COMBINE class
+# define ICL_COMBINE_CODOMAIN(itl_combine, codomain_type) itl_combine
+# define ICL_COMBINE_INSTANCE(combine_instance,codomain_type) combine_instance<codomain_type>
#endif
//------------------------------------------------------------------------------
// template parameter Section could be a template type parameter.
-#ifdef ITL_USE_SECTION_TEMPLATE_TEMPLATE
-# define ITL_SECTION template<class>class
-# define ITL_SECTION_CODOMAIN(itl_intersect, codomain_type) itl_intersect<codomain_type>
-# define ITL_SECTION_INSTANCE(section_instance,codomain_type) section_instance
-#else//ITL_USE_SECTION_TEMPLATE_TYPE
-# define ITL_SECTION class
-# define ITL_SECTION_CODOMAIN(itl_intersect, codomain_type) itl_intersect
-# define ITL_SECTION_INSTANCE(section_instance,codomain_type) section_instance<codomain_type>
+#ifdef ICL_USE_SECTION_TEMPLATE_TEMPLATE
+# define ICL_SECTION template<class>class
+# define ICL_SECTION_CODOMAIN(itl_intersect, codomain_type) itl_intersect<codomain_type>
+# define ICL_SECTION_INSTANCE(section_instance,codomain_type) section_instance
+#else//ICL_USE_SECTION_TEMPLATE_TYPE
+# define ICL_SECTION class
+# define ICL_SECTION_CODOMAIN(itl_intersect, codomain_type) itl_intersect
+# define ICL_SECTION_INSTANCE(section_instance,codomain_type) section_instance<codomain_type>
#endif
//------------------------------------------------------------------------------
// template parameter Interval could be a template type parameter.
-#ifdef ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
-# define ITL_INTERVAL(itl_compare) template<class,itl_compare>class
-# define ITL_INTERVAL2(itl_compare) template<class DomT2,itl_compare>class
-# define ITL_INTERVAL_TYPE(itl_interval, domain_type, itl_compare) itl_interval<domain_type,itl_compare>
-# define ITL_INTERVAL_INSTANCE(interval_instance,domain_type,itl_compare) interval_instance
-#else//ITL_USE_INTERVAL_TEMPLATE_TYPE
-# define ITL_INTERVAL(itl_compare) class
-# define ITL_INTERVAL2(itl_compare) class
-# define ITL_INTERVAL_TYPE(itl_interval, domain_type, itl_compare) itl_interval
-# define ITL_INTERVAL_INSTANCE(interval_instance,domain_type,itl_compare) typename interval_instance<domain_type,itl_compare>::type
+#ifdef ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
+# define ICL_INTERVAL(itl_compare) template<class,itl_compare>class
+# define ICL_INTERVAL2(itl_compare) template<class DomT2,itl_compare>class
+# define ICL_INTERVAL_TYPE(itl_interval, domain_type, itl_compare) itl_interval<domain_type,itl_compare>
+# define ICL_INTERVAL_INSTANCE(interval_instance,domain_type,itl_compare) interval_instance
+#else//ICL_USE_INTERVAL_TEMPLATE_TYPE
+# define ICL_INTERVAL(itl_compare) class
+# define ICL_INTERVAL2(itl_compare) class
+# define ICL_INTERVAL_TYPE(itl_interval, domain_type, itl_compare) itl_interval
+# define ICL_INTERVAL_INSTANCE(interval_instance,domain_type,itl_compare) typename interval_instance<domain_type,itl_compare>::type
#endif
//------------------------------------------------------------------------------
-#ifdef ITL_NEW_INTERVAL_IMPL
-# define ITL_INTERVAL_DEFAULT boost::icl::interval_type_default
+#ifdef ICL_NEW_INTERVAL_IMPL
+# define ICL_INTERVAL_DEFAULT boost::icl::interval_type_default
#else
-# define ITL_INTERVAL_DEFAULT boost::icl::interval
+# define ICL_INTERVAL_DEFAULT boost::icl::interval
#endif
//------------------------------------------------------------------------------
-#define ITL_ALLOC template<class>class
+#define ICL_ALLOC template<class>class
//------------------------------------------------------------------------------
-#endif // BOOST_ITL_DESIGN_CONFIG_HPP_JOFA_090214
+#endif // BOOST_ICL_DESIGN_CONFIG_HPP_JOFA_090214
Modified: sandbox/itl/boost/itl/detail/element_comparer.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/element_comparer.hpp (original)
+++ sandbox/itl/boost/itl/detail/element_comparer.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_ELEMENT_COMPARER_HPP_JOFA_090202
-#define BOOST_ITL_ELEMENT_COMPARER_HPP_JOFA_090202
+#ifndef BOOST_ICL_ELEMENT_COMPARER_HPP_JOFA_090202
+#define BOOST_ICL_ELEMENT_COMPARER_HPP_JOFA_090202
#include <boost/mpl/and.hpp>
#include <boost/itl/type_traits/is_map.hpp>
Modified: sandbox/itl/boost/itl/detail/element_iterator.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/element_iterator.hpp (original)
+++ sandbox/itl/boost/itl/detail/element_iterator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
-#define BOOST_ITL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
+#ifndef BOOST_ICL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
+#define BOOST_ICL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
#include <boost/mpl/if.hpp>
#include <boost/iterator/iterator_facade.hpp>
@@ -73,12 +73,12 @@
template<class SegmentT>
struct elemental;
-#ifdef ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
+#ifdef ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
- template<class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
- struct elemental<ITL_INTERVAL_TYPE(Interval,DomainT,Compare) >
+ template<class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
+ struct elemental<ICL_INTERVAL_TYPE(Interval,DomainT,Compare) >
{
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
typedef segment_type interval_type;
typedef DomainT type;
typedef DomainT domain_type;
@@ -87,23 +87,23 @@
};
template< class DomainT, class CodomainT,
- ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval >
- struct elemental<std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
+ ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval >
+ struct elemental<std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
{
- typedef std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare), CodomainT> segment_type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare), CodomainT> segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef std::pair<DomainT, CodomainT> type;
typedef DomainT domain_type;
typedef CodomainT codomain_type;
typedef mapped_reference<DomainT, CodomainT> transit_type;
};
-#else //ITL_USE_INTERVAL_TEMPLATE_TYPE
+#else //ICL_USE_INTERVAL_TEMPLATE_TYPE
- template<ITL_INTERVAL(ITL_COMPARE) Interval>
+ template<ICL_INTERVAL(ICL_COMPARE) Interval>
struct elemental
{
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
typedef segment_type interval_type;
typedef typename interval_traits<interval_type>::domain_type domain_type;
typedef domain_type type;
@@ -111,18 +111,18 @@
typedef domain_type transit_type;
};
- template< class CodomainT, ITL_INTERVAL(ITL_COMPARE) Interval >
- struct elemental<std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
+ template< class CodomainT, ICL_INTERVAL(ICL_COMPARE) Interval >
+ struct elemental<std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
{
- typedef std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare), CodomainT> segment_type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare), CodomainT> segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef typename interval_traits<interval_type>::domain_type domain_type;
typedef CodomainT codomain_type;
typedef std::pair<domain_type, codomain_type> type;
typedef mapped_reference<domain_type, codomain_type> transit_type;
};
-#endif //ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
+#endif //ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
//------------------------------------------------------------------------------
@@ -131,13 +131,13 @@
template<class SegmentIteratorT, class SegmentT>
struct segment_adapter;
-#ifdef ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
+#ifdef ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
-template<class SegmentIteratorT, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
-struct segment_adapter<SegmentIteratorT, ITL_INTERVAL_TYPE(Interval,DomainT,Compare) >
+template<class SegmentIteratorT, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
+struct segment_adapter<SegmentIteratorT, ICL_INTERVAL_TYPE(Interval,DomainT,Compare) >
{
typedef segment_adapter type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
typedef segment_type interval_type;
typedef typename interval_type::difference_type domain_difference_type;
typedef DomainT domain_type;
@@ -159,11 +159,11 @@
};
template < class SegmentIteratorT, class DomainT, class CodomainT,
- ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval >
-struct segment_adapter<SegmentIteratorT, std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
+ ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval >
+struct segment_adapter<SegmentIteratorT, std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
{
typedef segment_adapter type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef DomainT domain_type;
typedef std::pair<DomainT, CodomainT> element_type;
typedef CodomainT codomain_type;
@@ -184,13 +184,13 @@
}
};
-#else // ITL_USE_INTERVAL_TEMPLATE_TYPE
+#else // ICL_USE_INTERVAL_TEMPLATE_TYPE
-template<class SegmentIteratorT, ITL_INTERVAL(ITL_COMPARE) Interval>
+template<class SegmentIteratorT, ICL_INTERVAL(ICL_COMPARE) Interval>
struct segment_adapter
{
typedef segment_adapter type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) segment_type;
typedef segment_type interval_type;
typedef typename interval_traits<interval_type>::domain_type domain_type;
typedef domain_type codomain_type;
@@ -212,11 +212,11 @@
}
};
-template < class SegmentIteratorT, class CodomainT, ITL_INTERVAL(ITL_COMPARE) Interval >
-struct segment_adapter<SegmentIteratorT, std::pair<ITL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
+template < class SegmentIteratorT, class CodomainT, ICL_INTERVAL(ICL_COMPARE) Interval >
+struct segment_adapter<SegmentIteratorT, std::pair<ICL_INTERVAL_TYPE(Interval,DomainT,Compare)const, CodomainT> >
{
typedef segment_adapter type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef typename interval_traits<interval_type>::domain_type domain_type;
typedef CodomainT codomain_type;
typedef std::pair<domain_type, codomain_type> element_type;
@@ -237,7 +237,7 @@
}
};
-#endif // ITL_USE_INTERVAL_TEMPLATE_TEMPLATE
+#endif // ICL_USE_INTERVAL_TEMPLATE_TEMPLATE
template <class SegmentIteratorT>
class element_iterator
@@ -328,7 +328,7 @@
}} // namespace icl boost
-#endif // BOOST_ITL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
+#endif // BOOST_ICL_DETAIL_ELEMENT_ITERATOR_HPP_JOFA_091104
Modified: sandbox/itl/boost/itl/detail/exclusive_less_than.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/exclusive_less_than.hpp (original)
+++ sandbox/itl/boost/itl/detail/exclusive_less_than.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_EXCLUSIVE_LESS_THAN_HPP_JOFA_100929
-#define BOOST_ITL_DETAIL_EXCLUSIVE_LESS_THAN_HPP_JOFA_100929
+#ifndef BOOST_ICL_DETAIL_EXCLUSIVE_LESS_THAN_HPP_JOFA_100929
+#define BOOST_ICL_DETAIL_EXCLUSIVE_LESS_THAN_HPP_JOFA_100929
#include <boost/itl/concept/interval.hpp>
Modified: sandbox/itl/boost/itl/detail/interval_map_algo.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/interval_map_algo.hpp (original)
+++ sandbox/itl/boost/itl/detail/interval_map_algo.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_MAP_ALGO_HPP_JOFA_100730
-#define BOOST_ITL_INTERVAL_MAP_ALGO_HPP_JOFA_100730
+#ifndef BOOST_ICL_INTERVAL_MAP_ALGO_HPP_JOFA_100730
+#define BOOST_ICL_INTERVAL_MAP_ALGO_HPP_JOFA_100730
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/not.hpp>
Modified: sandbox/itl/boost/itl/detail/interval_morphism.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/interval_morphism.hpp (original)
+++ sandbox/itl/boost/itl/detail/interval_morphism.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
-#define BOOST_ITL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
+#ifndef BOOST_ICL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
+#define BOOST_ICL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/concept/interval_set_value.hpp>
@@ -21,7 +21,7 @@
template <typename ElementContainerT, typename IntervalContainerT>
void atomize(ElementContainerT& result, const IntervalContainerT& src)
{
- ITL_const_FORALL(typename IntervalContainerT, itv_, src)
+ ICL_const_FORALL(typename IntervalContainerT, itv_, src)
{
const typename IntervalContainerT::key_type& itv = icl::key_value<IntervalContainerT>(itv_);
typename IntervalContainerT::codomain_type coval = icl::co_value<IntervalContainerT>(itv_);
@@ -35,7 +35,7 @@
void cluster(IntervalContainerT& result, const ElementContainerT& src)
{
typedef typename IntervalContainerT::key_type key_type;
- ITL_const_FORALL(typename ElementContainerT, element_, src)
+ ICL_const_FORALL(typename ElementContainerT, element_, src)
{
const typename ElementContainerT::key_type& key = key_value<ElementContainerT>(element_);
const typename ElementContainerT::data_type& data = co_value<ElementContainerT>(element_);
@@ -68,7 +68,7 @@
void operator()(JointType& joint, SplitType& split)
{
icl::join(split);
- ITL_FORALL(typename SplitType, split_, split)
+ ICL_FORALL(typename SplitType, split_, split)
joint.insert(*split_);
}
};
@@ -79,7 +79,7 @@
void operator()(AbsorberType& absorber, EnricherType& enricher)
{
icl::absorb_identities(enricher);
- ITL_FORALL(typename EnricherType, enricher_, enricher)
+ ICL_FORALL(typename EnricherType, enricher_, enricher)
absorber.insert(*enricher_);
}
};
@@ -97,7 +97,7 @@
inline std::string binary_template_to_string<segmental::identity_absorber>::apply() { return "a0"; }
}} // namespace boost icl
-#endif // BOOST_ITL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
+#endif // BOOST_ICL_DETAIL_INTERVAL_MORPHISM_HPP_JOFA_080315
Modified: sandbox/itl/boost/itl/detail/interval_set_algo.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/interval_set_algo.hpp (original)
+++ sandbox/itl/boost/itl/detail/interval_set_algo.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_SET_ALGO_HPP_JOFA_081005
-#define BOOST_ITL_INTERVAL_SET_ALGO_HPP_JOFA_081005
+#ifndef BOOST_ICL_INTERVAL_SET_ALGO_HPP_JOFA_081005
+#define BOOST_ICL_INTERVAL_SET_ALGO_HPP_JOFA_081005
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/detail/relation_state.hpp>
Modified: sandbox/itl/boost/itl/detail/interval_subset_comparer.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/interval_subset_comparer.hpp (original)
+++ sandbox/itl/boost/itl/detail/interval_subset_comparer.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_SUBSET_COMPARER_HPP_JOFA_090827
-#define BOOST_ITL_INTERVAL_SUBSET_COMPARER_HPP_JOFA_090827
+#ifndef BOOST_ICL_INTERVAL_SUBSET_COMPARER_HPP_JOFA_090827
+#define BOOST_ICL_INTERVAL_SUBSET_COMPARER_HPP_JOFA_090827
#include <boost/itl/type_traits/is_map.hpp>
#include <boost/itl/detail/notate.hpp>
Modified: sandbox/itl/boost/itl/detail/map_algo.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/map_algo.hpp (original)
+++ sandbox/itl/boost/itl/detail/map_algo.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MAPALGO_HPP_JOFA_080225
-#define BOOST_ITL_MAPALGO_HPP_JOFA_080225
+#ifndef BOOST_ICL_MAPALGO_HPP_JOFA_080225
+#define BOOST_ICL_MAPALGO_HPP_JOFA_080225
#include <boost/mpl/and.hpp>
#include <boost/mpl/or.hpp>
Modified: sandbox/itl/boost/itl/detail/mapped_reference.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/mapped_reference.hpp (original)
+++ sandbox/itl/boost/itl/detail/mapped_reference.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
-#define BOOST_ITL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
+#ifndef BOOST_ICL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
+#define BOOST_ICL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/remove_const.hpp>
@@ -189,4 +189,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
+#endif // BOOST_ICL_DETAIL_MAPPED_REFERENCE_HPP_JOFA_091108
Modified: sandbox/itl/boost/itl/detail/notate.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/notate.hpp (original)
+++ sandbox/itl/boost/itl/detail/notate.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,19 +10,19 @@
/*-----------------------------------------------------------------------------
Macro definitions for some useful notations e.g. iteration headers
-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_NOTATE_HPP_JOFA_990119
-#define BOOST_ITL_DETAIL_NOTATE_HPP_JOFA_990119
+#ifndef BOOST_ICL_DETAIL_NOTATE_HPP_JOFA_990119
+#define BOOST_ICL_DETAIL_NOTATE_HPP_JOFA_990119
// Iterations over stl or stl-compatible containers:
-#define ITL_FORALL(type,iter,obj) for(type::iterator iter=(obj).begin(); (iter)!=(obj).end(); (iter)++)
-#define ITL_const_FORALL(type,iter,obj) for(type::const_iterator iter=(obj).begin(); !((iter)==(obj).end()); (iter)++)
+#define ICL_FORALL(type,iter,obj) for(type::iterator iter=(obj).begin(); (iter)!=(obj).end(); (iter)++)
+#define ICL_const_FORALL(type,iter,obj) for(type::const_iterator iter=(obj).begin(); !((iter)==(obj).end()); (iter)++)
-#define ITL_FORALL_THIS(iter) for(iterator iter=begin(); (iter)!=end(); (iter)++)
-#define ITL_const_FORALL_THIS(iter) for(const_iterator iter=this->begin(); (iter)!=this->end(); (iter)++)
+#define ICL_FORALL_THIS(iter) for(iterator iter=begin(); (iter)!=end(); (iter)++)
+#define ICL_const_FORALL_THIS(iter) for(const_iterator iter=this->begin(); (iter)!=this->end(); (iter)++)
// Plain old array iteration (assuming member function VecT::size()!)
-#define ITL_FORALL_VEC(idx, vec) for(int idx=0; idx<vec.size(); idx++)
+#define ICL_FORALL_VEC(idx, vec) for(int idx=0; idx<vec.size(); idx++)
namespace boost{namespace icl
{
@@ -30,6 +30,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_DETAIL_NOTATE_HPP_JOFA_990119
+#endif // BOOST_ICL_DETAIL_NOTATE_HPP_JOFA_990119
Modified: sandbox/itl/boost/itl/detail/on_absorbtion.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/on_absorbtion.hpp (original)
+++ sandbox/itl/boost/itl/detail/on_absorbtion.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_ON_ABSORBTION_HPP_JOFA_100915
-#define BOOST_ITL_TYPE_TRAITS_ON_ABSORBTION_HPP_JOFA_100915
+#ifndef BOOST_ICL_TYPE_TRAITS_ON_ABSORBTION_HPP_JOFA_100915
+#define BOOST_ICL_TYPE_TRAITS_ON_ABSORBTION_HPP_JOFA_100915
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/detail/relation_state.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/relation_state.hpp (original)
+++ sandbox/itl/boost/itl/detail/relation_state.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -9,8 +9,8 @@
/*-----------------------------------------------------------------------------+
States of comparison and inclusion relations as static constants
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_RELATION_STATE_HPP_JOFA_090214
-#define BOOST_ITL_RELATION_STATE_HPP_JOFA_090214
+#ifndef BOOST_ICL_RELATION_STATE_HPP_JOFA_090214
+#define BOOST_ICL_RELATION_STATE_HPP_JOFA_090214
namespace boost{namespace icl
{
@@ -32,6 +32,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_RELATION_STATE_HPP_JOFA_090214
+#endif // BOOST_ICL_RELATION_STATE_HPP_JOFA_090214
Modified: sandbox/itl/boost/itl/detail/set_algo.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/set_algo.hpp (original)
+++ sandbox/itl/boost/itl/detail/set_algo.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SET_ALGO_HPP_JOFA_990225
-#define BOOST_ITL_SET_ALGO_HPP_JOFA_990225
+#ifndef BOOST_ICL_SET_ALGO_HPP_JOFA_990225
+#define BOOST_ICL_SET_ALGO_HPP_JOFA_990225
#include <boost/type_traits/remove_const.hpp>
Modified: sandbox/itl/boost/itl/detail/std_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/std_set.hpp (original)
+++ sandbox/itl/boost/itl/detail/std_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DETAIL_STD_SET_HPP_JOFA_101007
-#define BOOST_ITL_DETAIL_STD_SET_HPP_JOFA_101007
+#ifndef BOOST_ICL_DETAIL_STD_SET_HPP_JOFA_101007
+#define BOOST_ICL_DETAIL_STD_SET_HPP_JOFA_101007
#include <set>
#include <boost/config.hpp>
@@ -34,5 +34,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_DETAIL_STD_SET_HPP_JOFA_101007
+#endif // BOOST_ICL_DETAIL_STD_SET_HPP_JOFA_101007
Modified: sandbox/itl/boost/itl/detail/subset_comparer.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/subset_comparer.hpp (original)
+++ sandbox/itl/boost/itl/detail/subset_comparer.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SUBSET_COMPARER_HPP_JOFA_090202
-#define BOOST_ITL_SUBSET_COMPARER_HPP_JOFA_090202
+#ifndef BOOST_ICL_SUBSET_COMPARER_HPP_JOFA_090202
+#define BOOST_ICL_SUBSET_COMPARER_HPP_JOFA_090202
#include <boost/mpl/and.hpp>
#include <boost/itl/type_traits/is_map.hpp>
Modified: sandbox/itl/boost/itl/discrete_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/discrete_interval.hpp (original)
+++ sandbox/itl/boost/itl/discrete_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DISCRETE_INTERVAL_HPP_JOFA_100403
-#define BOOST_ITL_DISCRETE_INTERVAL_HPP_JOFA_100403
+#ifndef BOOST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100403
+#define BOOST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100403
#include <functional>
#include <boost/static_assert.hpp>
@@ -23,7 +23,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class discrete_interval
{
public:
@@ -85,12 +85,12 @@
//==============================================================================
//=T discrete_interval -> concept intervals
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::discrete_interval<DomainT, Compare> >
{
typedef interval_traits type;
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::discrete_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -105,13 +105,13 @@
//==============================================================================
//=T discrete_interval -> concept dynamic_interval_traits
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct dynamic_interval_traits<boost::icl::discrete_interval<DomainT,Compare> >
{
typedef dynamic_interval_traits type;
typedef boost::icl::discrete_interval<DomainT,Compare> interval_type;
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
static interval_type construct(const domain_type& lo, const domain_type& up, interval_bounds bounds)
{
@@ -133,21 +133,21 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< discrete_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::dynamic);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct is_discrete_interval<discrete_interval<DomainT,Compare> >
{
typedef is_discrete_interval<discrete_interval<DomainT,Compare> > type;
BOOST_STATIC_CONSTANT(bool, value = is_discrete<DomainT>::value);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::discrete_interval<DomainT,Compare> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/dynamic_interval_traits.hpp
==============================================================================
--- sandbox/itl/boost/itl/dynamic_interval_traits.hpp (original)
+++ sandbox/itl/boost/itl/dynamic_interval_traits.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DYNAMIC_INTERVAL_TRAITS_HPP_JOFA_100926
-#define BOOST_ITL_DYNAMIC_INTERVAL_TRAITS_HPP_JOFA_100926
+#ifndef BOOST_ICL_DYNAMIC_INTERVAL_TRAITS_HPP_JOFA_100926
+#define BOOST_ICL_DYNAMIC_INTERVAL_TRAITS_HPP_JOFA_100926
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/functors.hpp
==============================================================================
--- sandbox/itl/boost/itl/functors.hpp (original)
+++ sandbox/itl/boost/itl/functors.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FUNCTORS_HPP_JOFA_080315
-#define BOOST_ITL_FUNCTORS_HPP_JOFA_080315
+#ifndef BOOST_ICL_FUNCTORS_HPP_JOFA_080315
+#define BOOST_ICL_FUNCTORS_HPP_JOFA_080315
#include <functional>
#include <boost/type_traits.hpp>
Modified: sandbox/itl/boost/itl/gregorian.hpp
==============================================================================
--- sandbox/itl/boost/itl/gregorian.hpp (original)
+++ sandbox/itl/boost/itl/gregorian.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_GREGORIAN_DATE_HPP_JOFA_080416
-#define BOOST_ITL_GREGORIAN_DATE_HPP_JOFA_080416
+#ifndef BOOST_ICL_GREGORIAN_DATE_HPP_JOFA_080416
+#define BOOST_ICL_GREGORIAN_DATE_HPP_JOFA_080416
#include <stdio.h>
#include <string>
Modified: sandbox/itl/boost/itl/impl_config.hpp
==============================================================================
--- sandbox/itl/boost/itl/impl_config.hpp (original)
+++ sandbox/itl/boost/itl/impl_config.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,40 +6,40 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_IMPL_CONFIG_HPP_JOFA_091225
-#define BOOST_ITL_IMPL_CONFIG_HPP_JOFA_091225
+#ifndef BOOST_ICL_IMPL_CONFIG_HPP_JOFA_091225
+#define BOOST_ICL_IMPL_CONFIG_HPP_JOFA_091225
/*-----------------------------------------------------------------------------+
You can choose an implementation for the basic set and map classes.
Select at most ONE of the following defines
+-----------------------------------------------------------------------------*/
-//#define ITL_USE_STD_IMPLEMENTATION
-//#define ITL_USE_BOOST_INTERPROCESS_IMPLEMENTATION
-//#define ITL_USE_BOOST_MOVE_IMPLEMENTATION
+//#define ICL_USE_STD_IMPLEMENTATION
+//#define ICL_USE_BOOST_INTERPROCESS_IMPLEMENTATION
+//#define ICL_USE_BOOST_MOVE_IMPLEMENTATION
/*-----------------------------------------------------------------------------+
-NO define or ITL_USE_STD_IMPLEMENTATION: Choose std::set and std::map as
+NO define or ICL_USE_STD_IMPLEMENTATION: Choose std::set and std::map as
implementing containers (default).
-ITL_USE_BOOST_INTERPROCESS_IMPLEMENTATION: Choose set and map implementations
+ICL_USE_BOOST_INTERPROCESS_IMPLEMENTATION: Choose set and map implementations
from boost::interprocess.
-ITL_USE_BOOST_MOVE_IMPLEMENTATION: Move aware containers from boost::container
+ICL_USE_BOOST_MOVE_IMPLEMENTATION: Move aware containers from boost::container
(NEW) are used. Currently (January 2010) this is only experimental.
boost::move from the boost::sandbox has to be used. This is depreciated for
production code, as long as move aware containers are not officially
accepted into boost.
+-----------------------------------------------------------------------------*/
-#if defined(ITL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
-#define ITL_IMPL_SPACE boost::interprocess
-#elif defined(ITL_USE_BOOST_MOVE_IMPLEMENTATION)
-#define ITL_IMPL_SPACE boost::container
+#if defined(ICL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
+#define ICL_IMPL_SPACE boost::interprocess
+#elif defined(ICL_USE_BOOST_MOVE_IMPLEMENTATION)
+#define ICL_IMPL_SPACE boost::container
#else
-#define ITL_IMPL_SPACE std
+#define ICL_IMPL_SPACE std
#endif
-#endif // BOOST_ITL_IMPL_CONFIG_HPP_JOFA_091225
+#endif // BOOST_ICL_IMPL_CONFIG_HPP_JOFA_091225
Modified: sandbox/itl/boost/itl/interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval.hpp (original)
+++ sandbox/itl/boost/itl/interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_HPP_JOFA_101014
-#define BOOST_ITL_INTERVAL_HPP_JOFA_101014
+#ifndef BOOST_ICL_INTERVAL_HPP_JOFA_101014
+#define BOOST_ICL_INTERVAL_HPP_JOFA_101014
#include <boost/itl/type_traits/interval_type_default.hpp>
@@ -15,13 +15,13 @@
namespace boost{ namespace icl
{
- template <class DomainT, ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ template <class DomainT, ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
struct interval
{
typedef typename interval_type_default<DomainT,Compare>::type interval_type;
typedef interval_type type;
-#ifdef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifdef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
static inline interval_type open(const DomainT& low, const DomainT& up)
{
@@ -74,7 +74,7 @@
static inline interval_type construct(const DomainT& low, const DomainT& up)
{ return icl::construct<interval_type>(low, up); }
-#else // ITL_USE_DYNAMIC_INTERVAL_BORDER_DEFAULTS
+#else // ICL_USE_DYNAMIC_INTERVAL_BORDER_DEFAULTS
static inline interval_type right_open(const DomainT& low, const DomainT& up)
{ return icl::construct<interval_type>(low, up, interval_bounds::right_open()); }
@@ -132,5 +132,5 @@
}} // namespace boost icl
-#endif // BOOST_ITL_INTERVAL_HPP_JOFA_101014
+#endif // BOOST_ICL_INTERVAL_HPP_JOFA_101014
Modified: sandbox/itl/boost/itl/interval_base_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_base_map.hpp (original)
+++ sandbox/itl/boost/itl/interval_base_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -56,11 +56,11 @@
typename DomainT,
typename CodomainT,
class Traits = icl::partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, CodomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, CodomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class interval_base_map
{
@@ -101,7 +101,7 @@
/// Conceptual is a map a set of elements of type \c element_type
typedef domain_mapping_type element_type;
/// The interval type of the map
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
/// Auxiliary type for overload resolution
typedef std::pair<interval_type,CodomainT> interval_mapping_type;
/// Type of an interval containers segment, that is spanned by an interval
@@ -119,17 +119,17 @@
//- Associated types: Functors
//--------------------------------------------------------------------------
/// Comparison functor for domain values
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
- typedef ITL_COMPARE_DOMAIN(Compare,segment_type) segment_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,segment_type) segment_compare;
/// Combine functor for codomain value aggregation
- typedef ITL_COMBINE_CODOMAIN(Combine,CodomainT) codomain_combine;
+ typedef ICL_COMBINE_CODOMAIN(Combine,CodomainT) codomain_combine;
/// Inverse Combine functor for codomain value aggregation
typedef typename inverse<codomain_combine>::type inverse_codomain_combine;
/// Intersection functor for codomain values
typedef typename mpl::if_
<has_set_semantics<codomain_type>
- , ITL_SECTION_CODOMAIN(Section,CodomainT)
+ , ICL_SECTION_CODOMAIN(Section,CodomainT)
, codomain_combine
>::type codomain_intersect;
@@ -151,7 +151,7 @@
allocator_type;
/// Container type for the implementation
- typedef ITL_IMPL_SPACE::map<interval_type,codomain_type,
+ typedef ICL_IMPL_SPACE::map<interval_type,codomain_type,
key_compare,allocator_type> ImplMapT;
/// key type of the implementing container
@@ -692,7 +692,7 @@
static void flip(Type& object, const segment_type& operand)
{
object += operand;
- ITL_FORALL(typename Type, it_, object)
+ ICL_FORALL(typename Type, it_, object)
it_->second = identity_element<codomain_type>::value();
if(mpl::not_<is_interval_splitter<Type> >::value)
@@ -774,7 +774,7 @@
//==============================================================================
//= Addition detail
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::add_front(const interval_type& inter_val, iterator& first_)
{
@@ -799,7 +799,7 @@
// ...[-- first_ --...
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::add_segment(const interval_type& inter_val, const CodomainT& co_val, iterator& it_)
@@ -821,7 +821,7 @@
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::add_main(interval_type& inter_val, const CodomainT& co_val,
@@ -837,7 +837,7 @@
}
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::add_rear(const interval_type& inter_val, const CodomainT& co_val, iterator& it_)
@@ -895,7 +895,7 @@
//==============================================================================
//= Addition
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline typename interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>::iterator
interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
@@ -933,7 +933,7 @@
}
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline typename interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>::iterator
interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
@@ -974,7 +974,7 @@
//= Subtraction detail
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::subtract_front(const interval_type& inter_val, iterator& it_)
{
@@ -991,7 +991,7 @@
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::subtract_main(const CodomainT& co_val, iterator& it_, const iterator& last_)
@@ -1003,7 +1003,7 @@
}
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::subtract_rear(interval_type& inter_val, const CodomainT& co_val, iterator& it_)
@@ -1027,7 +1027,7 @@
//==============================================================================
//= Subtraction
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
template<class Combiner>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::_subtract(const segment_type& minuend)
@@ -1054,7 +1054,7 @@
//==============================================================================
//= Insertion
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::insert_main(const interval_type& inter_val, const CodomainT& co_val,
iterator& it_, const iterator& last_)
@@ -1095,7 +1095,7 @@
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline typename interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>::iterator
interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::_insert(const segment_type& addend)
@@ -1125,7 +1125,7 @@
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline typename interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>::iterator
interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::_insert(iterator prior_, const segment_type& addend)
@@ -1155,7 +1155,7 @@
//==============================================================================
//= Erasure segment_type
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::erase_rest(interval_type& inter_val, const CodomainT& co_val,
iterator& it_, const iterator& last_)
@@ -1177,7 +1177,7 @@
}
}
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline SubType& interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::erase(const segment_type& minuend)
{
@@ -1239,7 +1239,7 @@
//==============================================================================
//= Erasure key_type
//==============================================================================
-template <class SubType, class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline SubType& interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
::erase(const interval_type& minuend)
{
@@ -1293,7 +1293,7 @@
template
<
class SubType,
- class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc
+ class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc
>
struct is_map<icl::interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
@@ -1304,7 +1304,7 @@
template
<
class SubType,
- class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc
+ class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc
>
struct has_inverse<icl::interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
@@ -1315,7 +1315,7 @@
template
<
class SubType,
- class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc
+ class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc
>
struct is_interval_container<icl::interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
@@ -1326,7 +1326,7 @@
template
<
class SubType,
- class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc
+ class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc
>
struct absorbs_identities<icl::interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
@@ -1337,7 +1337,7 @@
template
<
class SubType,
- class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc
+ class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc
>
struct is_total<icl::interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
Modified: sandbox/itl/boost/itl/interval_base_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_base_set.hpp (original)
+++ sandbox/itl/boost/itl/interval_base_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_BASE_SET_H_JOFA_990223
-#define BOOST_ITL_INTERVAL_BASE_SET_H_JOFA_990223
+#ifndef BOOST_ICL_INTERVAL_BASE_SET_H_JOFA_990223
+#define BOOST_ICL_INTERVAL_BASE_SET_H_JOFA_990223
#include <limits>
#include <boost/next_prior.hpp>
@@ -43,9 +43,9 @@
<
typename SubType,
typename DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class interval_base_set
{
@@ -79,7 +79,7 @@
typedef DomainT element_type;
/// The interval type of the set
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
/// The segment type of the set
typedef interval_type segment_type;
@@ -97,8 +97,8 @@
//- Associated types: Order
//--------------------------------------------------------------------------
/// Comparison functor for domain values
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
- typedef ITL_COMPARE_DOMAIN(Compare,segment_type) segment_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,segment_type) segment_compare;
/// Comparison functor for intervals
typedef exclusive_less_than<interval_type> interval_compare;
@@ -115,7 +115,7 @@
typedef Alloc<DomainT> domain_allocator_type;
/// Container type for the implementation
- typedef typename ITL_IMPL_SPACE::set<interval_type,key_compare,allocator_type> ImplSetT;
+ typedef typename ICL_IMPL_SPACE::set<interval_type,key_compare,allocator_type> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
@@ -366,7 +366,7 @@
} ;
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::add_front(const interval_type& inter_val, iterator& first_)
{
@@ -391,7 +391,7 @@
// ...[-- first_ --...
}
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::add_segment(const interval_type& inter_val, iterator& it_)
{
@@ -406,7 +406,7 @@
++it_;
}
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::add_main(interval_type& rest_interval, iterator& it_, const iterator& last_)
{
@@ -420,7 +420,7 @@
}
}
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline void interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::add_rear(const interval_type& inter_val, iterator& it_)
{
@@ -456,7 +456,7 @@
//==============================================================================
//= Addition
//==============================================================================
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline typename interval_base_set<SubType,DomainT,Compare,Interval,Alloc>::iterator
interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::_add(const segment_type& addend)
@@ -472,7 +472,7 @@
return that()->add_over(addend, insertion.first);
}
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline typename interval_base_set<SubType,DomainT,Compare,Interval,Alloc>::iterator
interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::_add(iterator prior_, const segment_type& addend)
@@ -491,7 +491,7 @@
//==============================================================================
//= Subtraction
//==============================================================================
-template <class SubType, class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class SubType, class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
inline SubType& interval_base_set<SubType,DomainT,Compare,Interval,Alloc>
::subtract(const segment_type& minuend)
{
@@ -526,7 +526,7 @@
// type traits
//-----------------------------------------------------------------------------
template<class SubType,
- class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+ class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_set<icl::interval_base_set<SubType,DomainT,Compare,Interval,Alloc> >
{
typedef is_set<icl::interval_base_set<SubType,DomainT,Compare,Interval,Alloc> > type;
@@ -534,7 +534,7 @@
};
template<class SubType,
- class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+ class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::interval_base_set<SubType,DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_container<icl::interval_base_set<SubType,DomainT,Compare,Interval,Alloc> > type;
Modified: sandbox/itl/boost/itl/interval_bounds.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_bounds.hpp (original)
+++ sandbox/itl/boost/itl/interval_bounds.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_BOUNDS_HPP_JOFA_100330
-#define BOOST_ITL_INTERVAL_BOUNDS_HPP_JOFA_100330
+#ifndef BOOST_ICL_INTERVAL_BOUNDS_HPP_JOFA_100330
+#define BOOST_ICL_INTERVAL_BOUNDS_HPP_JOFA_100330
#include <boost/utility/enable_if.hpp>
#include <boost/itl/detail/design_config.hpp>
Modified: sandbox/itl/boost/itl/interval_combining_style.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_combining_style.hpp (original)
+++ sandbox/itl/boost/itl/interval_combining_style.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_COMBINING_STYLE_HPP_JOFA_100906
-#define BOOST_ITL_INTERVAL_COMBINING_STYLE_HPP_JOFA_100906
+#ifndef BOOST_ICL_INTERVAL_COMBINING_STYLE_HPP_JOFA_100906
+#define BOOST_ICL_INTERVAL_COMBINING_STYLE_HPP_JOFA_100906
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_map.hpp (original)
+++ sandbox/itl/boost/itl/interval_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_MAP_HPP_JOFA_080705
-#define BOOST_ITL_INTERVAL_MAP_HPP_JOFA_080705
+#ifndef BOOST_ICL_INTERVAL_MAP_HPP_JOFA_080705
+#define BOOST_ICL_INTERVAL_MAP_HPP_JOFA_080705
#include <boost/assert.hpp>
#include <boost/itl/type_traits/is_map.hpp>
@@ -17,8 +17,8 @@
{
template<class DomainT, class CodomainT, class Traits,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
class split_interval_map;
/** \brief implements a map as a map of intervals - on insertion
@@ -28,11 +28,11 @@
typename DomainT,
typename CodomainT,
class Traits = icl::partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, CodomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, CodomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class interval_map:
@@ -48,7 +48,7 @@
typedef interval_base_map<type,
DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> base_type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef typename base_type::iterator iterator;
typedef typename base_type::value_type value_type;
typedef typename base_type::element_type element_type;
@@ -108,7 +108,7 @@
this->clear();
// Can be implemented via _map.insert: Interval joining not necessary.
iterator prior_ = this->_map.end();
- ITL_const_FORALL(typename base_map_type, it_, src)
+ ICL_const_FORALL(typename base_map_type, it_, src)
prior_ = this->add(prior_, *it_);
}
@@ -206,14 +206,14 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_map<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_map<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct has_inverse<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef has_inverse<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
@@ -221,21 +221,21 @@
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_interval_container<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct absorbs_identities<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef absorbs_identities<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = (Traits::absorbs_identities));
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_total<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_total<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
@@ -246,7 +246,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/interval_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_set.hpp (original)
+++ sandbox/itl/boost/itl/interval_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_SET_HPP_JOFA_990223
-#define BOOST_ITL_INTERVAL_SET_HPP_JOFA_990223
+#ifndef BOOST_ICL_INTERVAL_SET_HPP_JOFA_990223
+#define BOOST_ICL_INTERVAL_SET_HPP_JOFA_990223
#include <boost/assert.hpp>
#include <boost/itl/type_traits/is_interval_joiner.hpp>
@@ -20,9 +20,9 @@
template
<
typename DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class interval_set:
public interval_base_set<interval_set<DomainT,Compare,Interval,Alloc>,
@@ -49,12 +49,12 @@
/// The element type of the set
typedef DomainT element_type;
/// The interval type of the set
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
/// The segment type of the set
typedef interval_type segment_type;
/// Comparison functor for domain values
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
/// Comparison functor for intervals
typedef exclusive_less_than<interval_type> interval_compare;
@@ -71,7 +71,7 @@
typedef typename icl::set<DomainT,Compare,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename icl::set<interval_type,ITL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
+ typedef typename icl::set<interval_type,ICL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
@@ -131,7 +131,7 @@
this->clear();
// Has to be implemented via add. there might be touching borders to be joined
iterator prior_ = this->_set.end();
- ITL_const_FORALL(typename base_set_type, it_, src)
+ ICL_const_FORALL(typename base_set_type, it_, src)
prior_ = this->add(prior_, *it_);
}
@@ -165,21 +165,21 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_set<icl::interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_set<icl::interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_container<icl::interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_joiner<icl::interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_joiner<icl::interval_set<DomainT,Compare,Interval,Alloc> > type;
@@ -190,7 +190,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::interval_set<DomainT,Compare,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/interval_traits.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_traits.hpp (original)
+++ sandbox/itl/boost/itl/interval_traits.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INTERVAL_TRAITS_HPP_JOFA_100926
-#define BOOST_ITL_INTERVAL_TRAITS_HPP_JOFA_100926
+#ifndef BOOST_ICL_INTERVAL_TRAITS_HPP_JOFA_100926
+#define BOOST_ICL_INTERVAL_TRAITS_HPP_JOFA_100926
#include <boost/itl/type_traits/domain_type_of.hpp>
#include <boost/itl/type_traits/difference_type_of.hpp>
Modified: sandbox/itl/boost/itl/iterator.hpp
==============================================================================
--- sandbox/itl/boost/itl/iterator.hpp (original)
+++ sandbox/itl/boost/itl/iterator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_ITERATOR_HPP_JOFA_091003
-#define BOOST_ITL_ITERATOR_HPP_JOFA_091003
+#ifndef BOOST_ICL_ITERATOR_HPP_JOFA_091003
+#define BOOST_ICL_ITERATOR_HPP_JOFA_091003
#include <iterator>
#include <boost/config/warning_disable.hpp>
@@ -98,6 +98,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_ITERATOR_HPP_JOFA_091003
+#endif // BOOST_ICL_ITERATOR_HPP_JOFA_091003
Modified: sandbox/itl/boost/itl/left_open_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/left_open_interval.hpp (original)
+++ sandbox/itl/boost/itl/left_open_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_LEFT_OPEN_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_LEFT_OPEN_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_LEFT_OPEN_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_LEFT_OPEN_INTERVAL_HPP_JOFA_100930
#include <functional>
#include <boost/concept/assert.hpp>
@@ -18,7 +18,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class left_open_interval
{
public:
@@ -70,11 +70,11 @@
//==============================================================================
//=T left_open_interval -> concept intervals
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::left_open_interval<DomainT, Compare> >
{
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::left_open_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -90,21 +90,21 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< left_open_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::static_left_open);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::left_open_interval<DomainT,Compare> >
{
static std::string apply()
{ return "(I]<"+ type_to_string<DomainT>::apply() +">"; }
};
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct value_size<icl::left_open_interval<DomainT,Compare> >
{
static std::size_t apply(const icl::left_open_interval<DomainT>& value)
Modified: sandbox/itl/boost/itl/map.hpp
==============================================================================
--- sandbox/itl/boost/itl/map.hpp (original)
+++ sandbox/itl/boost/itl/map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,14 +5,14 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MAP_HPP_JOFA_070519
-#define BOOST_ITL_MAP_HPP_JOFA_070519
+#ifndef BOOST_ICL_MAP_HPP_JOFA_070519
+#define BOOST_ICL_MAP_HPP_JOFA_070519
#include <boost/itl/impl_config.hpp>
-#if defined(ITL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
+#if defined(ICL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
#include <boost/interprocess/containers/map.hpp>
-#elif defined(ITL_USE_BOOST_MOVE_IMPLEMENTATION)
+#elif defined(ICL_USE_BOOST_MOVE_IMPLEMENTATION)
#include <boost/container/map.hpp>
#else
#include <map>
@@ -87,19 +87,19 @@
typename DomainT,
typename CodomainT,
class Traits = icl::partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, CodomainT),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, CodomainT),
+ ICL_ALLOC Alloc = std::allocator
>
-class map: private ITL_IMPL_SPACE::map<DomainT, CodomainT, ITL_COMPARE_DOMAIN(Compare,DomainT),
+class map: private ICL_IMPL_SPACE::map<DomainT, CodomainT, ICL_COMPARE_DOMAIN(Compare,DomainT),
Alloc<std::pair<const DomainT, CodomainT> > >
{
public:
typedef Alloc<typename std::pair<const DomainT, CodomainT> > allocator_type;
typedef typename icl::map<DomainT,CodomainT,Traits, Compare,Combine,Section,Alloc> type;
- typedef typename ITL_IMPL_SPACE::map<DomainT, CodomainT, ITL_COMPARE_DOMAIN(Compare,DomainT),
+ typedef typename ICL_IMPL_SPACE::map<DomainT, CodomainT, ICL_COMPARE_DOMAIN(Compare,DomainT),
allocator_type> base_type;
typedef typename icl::set<DomainT, Compare, Alloc > set_type;
typedef set_type key_object_type;
@@ -115,14 +115,14 @@
typedef CodomainT data_type;
typedef std::pair<const DomainT, CodomainT> element_type;
typedef std::pair<const DomainT, CodomainT> value_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
- typedef ITL_COMBINE_CODOMAIN(Combine,CodomainT) codomain_combine;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMBINE_CODOMAIN(Combine,CodomainT) codomain_combine;
typedef domain_compare key_compare;
- typedef ITL_COMPARE_DOMAIN(Compare,element_type) element_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,element_type) element_compare;
typedef typename inverse<codomain_combine >::type inverse_codomain_combine;
typedef typename mpl::if_
<has_set_semantics<codomain_type>
- , ITL_SECTION_CODOMAIN(Section,CodomainT)
+ , ICL_SECTION_CODOMAIN(Section,CodomainT)
, codomain_combine
>::type codomain_intersect;
typedef typename inverse<codomain_intersect>::type inverse_codomain_intersect;
@@ -488,7 +488,7 @@
static void flip(Type& object, const element_type& operand)
{
object.add(operand);
- ITL_FORALL(typename Type, it_, object)
+ ICL_FORALL(typename Type, it_, object)
it_->second = identity_element<codomain_type>::value();
}
};
@@ -539,7 +539,7 @@
//==============================================================================
//= Addition<ElementMap>
//==============================================================================
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
template <class Combiner>
map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>&
map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>
@@ -567,7 +567,7 @@
}
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
template <class Combiner>
typename map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>::iterator
map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>
@@ -598,7 +598,7 @@
//==============================================================================
//= Subtraction<ElementMap>
//==============================================================================
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
template <class Combiner>
map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>&
map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc>::_subtract(const value_type& minuend)
@@ -620,35 +620,35 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
struct is_map<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
{
typedef is_map<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
struct has_inverse<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
{
typedef has_inverse<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = (has_inverse<CodomainT>::value));
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
struct absorbs_identities<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
{
typedef absorbs_identities type;
BOOST_STATIC_CONSTANT(int, value = Traits::absorbs_identities);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
struct is_total<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
{
typedef is_total type;
BOOST_STATIC_CONSTANT(int, value = Traits::is_total);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_ALLOC Alloc>
struct type_to_string<icl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
{
static std::string apply()
@@ -663,5 +663,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_MAP_HPP_JOFA_070519
+#endif // BOOST_ICL_MAP_HPP_JOFA_070519
Modified: sandbox/itl/boost/itl/open_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/open_interval.hpp (original)
+++ sandbox/itl/boost/itl/open_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_OPEN_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_OPEN_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_OPEN_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_OPEN_INTERVAL_HPP_JOFA_100930
#include <functional>
#include <boost/concept/assert.hpp>
@@ -18,7 +18,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class open_interval
{
public:
@@ -70,11 +70,11 @@
//==============================================================================
//=T open_interval -> concept intervals
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::open_interval<DomainT, Compare> >
{
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::open_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -90,21 +90,21 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< open_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::static_open);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::open_interval<DomainT,Compare> >
{
static std::string apply()
{ return "(I)<"+ type_to_string<DomainT>::apply() +">"; }
};
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct value_size<icl::open_interval<DomainT,Compare> >
{
static std::size_t apply(const icl::open_interval<DomainT>& value)
Modified: sandbox/itl/boost/itl/predicates.hpp
==============================================================================
--- sandbox/itl/boost/itl/predicates.hpp (original)
+++ sandbox/itl/boost/itl/predicates.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_PREDICATES_HPP_JOFA_990224
-#define BOOST_ITL_PREDICATES_HPP_JOFA_990224
+#ifndef BOOST_ICL_PREDICATES_HPP_JOFA_990224
+#define BOOST_ICL_PREDICATES_HPP_JOFA_990224
#include <functional>
#include <boost/itl/type_traits/type_to_string.hpp>
Modified: sandbox/itl/boost/itl/ptime.hpp
==============================================================================
--- sandbox/itl/boost/itl/ptime.hpp (original)
+++ sandbox/itl/boost/itl/ptime.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,8 +12,8 @@
w.r.t. addition (identity_element()).
------------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_PTIME_HPP_JOFA_080416
-#define BOOST_ITL_PTIME_HPP_JOFA_080416
+#ifndef BOOST_ICL_PTIME_HPP_JOFA_080416
+#define BOOST_ICL_PTIME_HPP_JOFA_080416
#include <stdio.h>
#include <string>
Modified: sandbox/itl/boost/itl/rational.hpp
==============================================================================
--- sandbox/itl/boost/itl/rational.hpp (original)
+++ sandbox/itl/boost/itl/rational.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,8 +10,8 @@
itl_rational provides adapter code for boost::rational.
------------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_RATIONAL_HPP_JOFA_080913
-#define BOOST_ITL_RATIONAL_HPP_JOFA_080913
+#ifndef BOOST_ICL_RATIONAL_HPP_JOFA_080913
+#define BOOST_ICL_RATIONAL_HPP_JOFA_080913
#ifdef BOOST_MSVC
#pragma warning(push)
Modified: sandbox/itl/boost/itl/right_open_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/right_open_interval.hpp (original)
+++ sandbox/itl/boost/itl/right_open_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_RIGHT_OPEN_INTERVAL_HPP_JOFA_100323
-#define BOOST_ITL_RIGHT_OPEN_INTERVAL_HPP_JOFA_100323
+#ifndef BOOST_ICL_RIGHT_OPEN_INTERVAL_HPP_JOFA_100323
+#define BOOST_ICL_RIGHT_OPEN_INTERVAL_HPP_JOFA_100323
#include <functional>
#include <boost/concept/assert.hpp>
@@ -18,7 +18,7 @@
{
template <class DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
class right_open_interval
{
public:
@@ -69,11 +69,11 @@
//==============================================================================
//=T right_open_interval -> concept intervals
//==============================================================================
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct interval_traits< icl::right_open_interval<DomainT, Compare> >
{
typedef DomainT domain_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef icl::right_open_interval<DomainT, Compare> interval_type;
static interval_type construct(const domain_type& lo, const domain_type& up)
@@ -89,21 +89,21 @@
//==============================================================================
//= Type traits
//==============================================================================
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct interval_bound_type< right_open_interval<DomainT,Compare> >
{
typedef interval_bound_type type;
BOOST_STATIC_CONSTANT(bound_type, value = interval_bounds::static_right_open);
};
-template <class DomainT, ITL_COMPARE Compare>
+template <class DomainT, ICL_COMPARE Compare>
struct type_to_string<icl::right_open_interval<DomainT,Compare> >
{
static std::string apply()
{ return "[I)<"+ type_to_string<DomainT>::apply() +">"; }
};
-template<class DomainT, ITL_COMPARE Compare>
+template<class DomainT, ICL_COMPARE Compare>
struct value_size<icl::right_open_interval<DomainT,Compare> >
{
static std::size_t apply(const icl::right_open_interval<DomainT>& value)
Modified: sandbox/itl/boost/itl/separate_interval_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/separate_interval_set.hpp (original)
+++ sandbox/itl/boost/itl/separate_interval_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SEPARATE_INTERVAL_SET_HPP_JOFA_080608
-#define BOOST_ITL_SEPARATE_INTERVAL_SET_HPP_JOFA_080608
+#ifndef BOOST_ICL_SEPARATE_INTERVAL_SET_HPP_JOFA_080608
+#define BOOST_ICL_SEPARATE_INTERVAL_SET_HPP_JOFA_080608
#include <boost/assert.hpp>
#include <boost/itl/type_traits/is_interval_separator.hpp>
@@ -20,9 +20,9 @@
template
<
typename DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class separate_interval_set:
public interval_base_set<separate_interval_set<DomainT,Compare,Interval,Alloc>,
@@ -46,12 +46,12 @@
/// The element type of the set
typedef DomainT element_type;
/// The interval type of the set
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
/// The segment type of the set
typedef interval_type segment_type;
/// Comparison functor for domain values
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
/// Comparison functor for intervals
typedef exclusive_less_than<interval_type> interval_compare;
@@ -68,7 +68,7 @@
typedef typename icl::set<DomainT,Compare,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename icl::set<interval_type,ITL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
+ typedef typename icl::set<interval_type,ICL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
@@ -153,21 +153,21 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_set<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_set<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_container<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_separator<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_separator<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> > type;
@@ -177,7 +177,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::separate_interval_set<DomainT,Compare,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/set.hpp
==============================================================================
--- sandbox/itl/boost/itl/set.hpp (original)
+++ sandbox/itl/boost/itl/set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,14 +5,14 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SET_HPP_JOFA_070519
-#define BOOST_ITL_SET_HPP_JOFA_070519
+#ifndef BOOST_ICL_SET_HPP_JOFA_070519
+#define BOOST_ICL_SET_HPP_JOFA_070519
#include <boost/itl/impl_config.hpp>
-#if defined(ITL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
+#if defined(ICL_USE_BOOST_INTERPROCESS_IMPLEMENTATION)
#include <boost/interprocess/containers/set.hpp>
-#elif defined(ITL_USE_BOOST_MOVE_IMPLEMENTATION)
+#elif defined(ICL_USE_BOOST_MOVE_IMPLEMENTATION)
#include <boost/container/set.hpp>
#else
#include <set>
@@ -43,14 +43,14 @@
template
<
typename DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_ALLOC Alloc = std::allocator
>
-class set: private ITL_IMPL_SPACE::set<DomainT, ITL_COMPARE_DOMAIN(Compare,DomainT), Alloc<DomainT> >
+class set: private ICL_IMPL_SPACE::set<DomainT, ICL_COMPARE_DOMAIN(Compare,DomainT), Alloc<DomainT> >
{
public:
typedef typename icl::set<DomainT, Compare, Alloc> type;
- typedef typename ITL_IMPL_SPACE::set<DomainT, ITL_COMPARE_DOMAIN(Compare,DomainT), Alloc<DomainT> > base_type;
+ typedef typename ICL_IMPL_SPACE::set<DomainT, ICL_COMPARE_DOMAIN(Compare,DomainT), Alloc<DomainT> > base_type;
typedef type key_object_type;
public:
@@ -60,10 +60,10 @@
typedef DomainT key_type;
typedef DomainT value_type;
typedef DomainT data_type;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
typedef domain_compare element_compare;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) key_compare;
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) value_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) key_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) value_compare;
typedef Alloc<DomainT> allocator_type;
public:
@@ -219,5 +219,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_SET_HPP_JOFA_070519
+#endif // BOOST_ICL_SET_HPP_JOFA_070519
Modified: sandbox/itl/boost/itl/split_interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/split_interval_map.hpp (original)
+++ sandbox/itl/boost/itl/split_interval_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SPLIT_INTERVAL_MAP_HPP_JOFA_000706
-#define BOOST_ITL_SPLIT_INTERVAL_MAP_HPP_JOFA_000706
+#ifndef BOOST_ICL_SPLIT_INTERVAL_MAP_HPP_JOFA_000706
+#define BOOST_ICL_SPLIT_INTERVAL_MAP_HPP_JOFA_000706
#include <boost/itl/interval_set.hpp>
#include <boost/itl/interval_map.hpp>
@@ -24,11 +24,11 @@
typename DomainT,
typename CodomainT,
class Traits = icl::partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, CodomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, CodomainT),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, CodomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class split_interval_map:
public interval_base_map<split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>,
@@ -45,7 +45,7 @@
typedef DomainT domain_type;
typedef CodomainT codomain_type;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
typedef typename base_type::iterator iterator;
typedef typename base_type::value_type value_type;
typedef typename base_type::element_type element_type;
@@ -152,42 +152,42 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_map<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_map<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct has_inverse<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef has_inverse<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = (has_inverse<CodomainT>::value));
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_interval_container<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_splitter<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_interval_splitter<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct absorbs_identities<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef absorbs_identities<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = (Traits::absorbs_identities));
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_total<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
typedef is_total<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> > type;
@@ -195,7 +195,7 @@
};
-template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, class CodomainT, class Traits, ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::split_interval_map<DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/split_interval_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/split_interval_set.hpp (original)
+++ sandbox/itl/boost/itl/split_interval_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -21,9 +21,9 @@
template
<
typename DomainT,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class split_interval_set:
public interval_base_set<split_interval_set<DomainT,Compare,Interval,Alloc>,
@@ -45,12 +45,12 @@
/// The element type of the set
typedef DomainT element_type;
/// The interval type of the set
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) interval_type;
/// The segment type of the set
typedef interval_type segment_type;
/// Comparison functor for domain values
- typedef ITL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
+ typedef ICL_COMPARE_DOMAIN(Compare,DomainT) domain_compare;
/// Comparison functor for intervals
typedef exclusive_less_than<interval_type> interval_compare;
@@ -67,7 +67,7 @@
typedef typename icl::set<DomainT,Compare,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename icl::set<interval_type,ITL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
+ typedef typename icl::set<interval_type,ICL_EXCLUSIVE_LESS(interval_type),Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
@@ -167,21 +167,21 @@
//-----------------------------------------------------------------------------
// type traits
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_set<icl::split_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_set<icl::split_interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_container<icl::split_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_container<icl::split_interval_set<DomainT,Compare,Interval,Alloc> > type;
BOOST_STATIC_CONSTANT(bool, value = true);
};
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct is_interval_splitter<icl::split_interval_set<DomainT,Compare,Interval,Alloc> >
{
typedef is_interval_splitter<icl::split_interval_set<DomainT,Compare,Interval,Alloc> > type;
@@ -191,7 +191,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template <class DomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::split_interval_set<DomainT,Compare,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/itl/boost/itl/type_traits/absorbs_identities.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/absorbs_identities.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/absorbs_identities.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_ABSORBS_IDENTITIES_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_ABSORBS_IDENTITIES_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_ABSORBS_IDENTITIES_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_ABSORBS_IDENTITIES_HPP_JOFA_081004
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/adds_inversely.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/adds_inversely.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/adds_inversely.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
-#define BOOST_ITL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
+#ifndef BOOST_ICL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
+#define BOOST_ICL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
#include <boost/itl/type_traits/has_inverse.hpp>
#include <boost/itl/functors.hpp>
@@ -24,6 +24,6 @@
}} // namespace boost icl
-#endif // BOOST_ITL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
+#endif // BOOST_ICL_TYPE_TRAITS_ADDS_INVERSELY_HPP_JOFA_100829
Modified: sandbox/itl/boost/itl/type_traits/codomain_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/codomain_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/codomain_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_CODOMAIN_TYPE_OF_HPP_JOFA_100829
-#define BOOST_ITL_TYPE_TRAITS_CODOMAIN_TYPE_OF_HPP_JOFA_100829
+#ifndef BOOST_ICL_TYPE_TRAITS_CODOMAIN_TYPE_OF_HPP_JOFA_100829
+#define BOOST_ICL_TYPE_TRAITS_CODOMAIN_TYPE_OF_HPP_JOFA_100829
#include <set>
#include <boost/mpl/has_xxx.hpp>
Modified: sandbox/itl/boost/itl/type_traits/difference.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/difference.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/difference.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_DIFFERENCE_HPP_JOFA_080911
-#define BOOST_ITL_TYPE_TRAITS_DIFFERENCE_HPP_JOFA_080911
+#ifndef BOOST_ICL_TYPE_TRAITS_DIFFERENCE_HPP_JOFA_080911
+#define BOOST_ICL_TYPE_TRAITS_DIFFERENCE_HPP_JOFA_080911
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/difference_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/difference_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/difference_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_DIFFERENCE_TYPE_OF_HPP_JOFA_080911
-#define BOOST_ITL_TYPE_TRAITS_DIFFERENCE_TYPE_OF_HPP_JOFA_080911
+#ifndef BOOST_ICL_TYPE_TRAITS_DIFFERENCE_TYPE_OF_HPP_JOFA_080911
+#define BOOST_ICL_TYPE_TRAITS_DIFFERENCE_TYPE_OF_HPP_JOFA_080911
#include <boost/config.hpp> // For macro BOOST_STATIC_CONSTANT
#include <boost/itl/type_traits/no_type.hpp>
Modified: sandbox/itl/boost/itl/type_traits/domain_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/domain_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/domain_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_DOMAIN_TYPE_OF_HPP_JOFA_100902
-#define BOOST_ITL_TYPE_TRAITS_DOMAIN_TYPE_OF_HPP_JOFA_100902
+#ifndef BOOST_ICL_TYPE_TRAITS_DOMAIN_TYPE_OF_HPP_JOFA_100902
+#define BOOST_ICL_TYPE_TRAITS_DOMAIN_TYPE_OF_HPP_JOFA_100902
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/itl/boost/itl/type_traits/element_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/element_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/element_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_ELEMENT_TYPE_OF_HPP_JOFA_100902
-#define BOOST_ITL_TYPE_TRAITS_ELEMENT_TYPE_OF_HPP_JOFA_100902
+#ifndef BOOST_ICL_TYPE_TRAITS_ELEMENT_TYPE_OF_HPP_JOFA_100902
+#define BOOST_ICL_TYPE_TRAITS_ELEMENT_TYPE_OF_HPP_JOFA_100902
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/itl/boost/itl/type_traits/has_inverse.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/has_inverse.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/has_inverse.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
-#define BOOST_ITL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
+#ifndef BOOST_ICL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
+#define BOOST_ICL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
#include <boost/type_traits/is_signed.hpp>
#include <boost/type_traits/is_floating_point.hpp>
@@ -24,6 +24,6 @@
}} // namespace boost icl
-#endif // BOOST_ITL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
+#endif // BOOST_ICL_TYPE_TRAITS_HAS_INVERSE_HPP_JOFA_090205
Modified: sandbox/itl/boost/itl/type_traits/has_set_semantics.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/has_set_semantics.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/has_set_semantics.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_HAS_SET_SEMANTICS_HPP_JOFA_100829
-#define BOOST_ITL_TYPE_TRAITS_HAS_SET_SEMANTICS_HPP_JOFA_100829
+#ifndef BOOST_ICL_TYPE_TRAITS_HAS_SET_SEMANTICS_HPP_JOFA_100829
+#define BOOST_ICL_TYPE_TRAITS_HAS_SET_SEMANTICS_HPP_JOFA_100829
#include <boost/mpl/or.hpp>
#include <boost/mpl/and.hpp>
Modified: sandbox/itl/boost/itl/type_traits/identity_element.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/identity_element.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/identity_element.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IDENTITY_ELEMENT_HPP_JOFA_080912
-#define BOOST_ITL_TYPE_TRAITS_IDENTITY_ELEMENT_HPP_JOFA_080912
+#ifndef BOOST_ICL_TYPE_TRAITS_IDENTITY_ELEMENT_HPP_JOFA_080912
+#define BOOST_ICL_TYPE_TRAITS_IDENTITY_ELEMENT_HPP_JOFA_080912
#include <boost/itl/type_traits/type_to_string.hpp>
Modified: sandbox/itl/boost/itl/type_traits/infinity.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/infinity.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/infinity.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_INFINITY_HPP_JOFA_100322
-#define BOOST_ITL_TYPE_TRAITS_INFINITY_HPP_JOFA_100322
+#ifndef BOOST_ICL_TYPE_TRAITS_INFINITY_HPP_JOFA_100322
+#define BOOST_ICL_TYPE_TRAITS_INFINITY_HPP_JOFA_100322
#include <string>
#include <boost/itl/type_traits/is_numeric.hpp>
Modified: sandbox/itl/boost/itl/type_traits/interval_type_default.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/interval_type_default.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/interval_type_default.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_INTERVAL_TYPE_DEFAULT_HPP_JOFA_100403
-#define BOOST_ITL_TYPE_TRAITS_INTERVAL_TYPE_DEFAULT_HPP_JOFA_100403
+#ifndef BOOST_ICL_TYPE_TRAITS_INTERVAL_TYPE_DEFAULT_HPP_JOFA_100403
+#define BOOST_ICL_TYPE_TRAITS_INTERVAL_TYPE_DEFAULT_HPP_JOFA_100403
#include <boost/mpl/if.hpp>
#include <boost/itl/detail/design_config.hpp>
@@ -22,10 +22,10 @@
namespace boost{ namespace icl
{
- template <class DomainT, ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT)>
+ template <class DomainT, ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT)>
struct interval_type_default
{
-#ifdef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifdef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
typedef
typename mpl::if_< is_discrete<DomainT>
# ifdef BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT
Modified: sandbox/itl/boost/itl/type_traits/interval_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/interval_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/interval_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_INTERVAL_TYPE_OF_HPP_JOFA_100910
-#define BOOST_ITL_TYPE_TRAITS_INTERVAL_TYPE_OF_HPP_JOFA_100910
+#ifndef BOOST_ICL_TYPE_TRAITS_INTERVAL_TYPE_OF_HPP_JOFA_100910
+#define BOOST_ICL_TYPE_TRAITS_INTERVAL_TYPE_OF_HPP_JOFA_100910
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_assoc_element_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_ASSOC_ELEMENT_CONTAINER_HPP_JOFA_100831
-#define BOOST_ITL_TYPE_TRAITS_IS_ASSOC_ELEMENT_CONTAINER_HPP_JOFA_100831
+#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>
Modified: sandbox/itl/boost/itl/type_traits/is_associative_element_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_associative_element_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_associative_element_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_ASSOCIATIVE_ELEMENT_CONTAINER_HPP_JOFA_100831
-#define BOOST_ITL_TYPE_TRAITS_IS_ASSOCIATIVE_ELEMENT_CONTAINER_HPP_JOFA_100831
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_ASSOCIATIVE_ELEMENT_CONTAINER_HPP_JOFA_100831
+#define BOOST_ICL_TYPE_TRAITS_IS_ASSOCIATIVE_ELEMENT_CONTAINER_HPP_JOFA_100831
#include <boost/mpl/and.hpp>
#include <boost/mpl/or.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_asymmetric_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_asymmetric_interval.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_asymmetric_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_ASYMMETRIC_INTERVAL_HPP_JOFA_100327
-#define BOOST_ITL_TYPE_TRAITS_IS_ASYMMETRIC_INTERVAL_HPP_JOFA_100327
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_ASYMMETRIC_INTERVAL_HPP_JOFA_100327
+#define BOOST_ICL_TYPE_TRAITS_IS_ASYMMETRIC_INTERVAL_HPP_JOFA_100327
#include <boost/itl/type_traits/is_interval.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_combinable.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_combinable.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_combinable.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_IS_COMBINABLE_HPP_JOFA_090115
-#define BOOST_ITL_IS_COMBINABLE_HPP_JOFA_090115
+#ifndef BOOST_ICL_IS_COMBINABLE_HPP_JOFA_090115
+#define BOOST_ICL_IS_COMBINABLE_HPP_JOFA_090115
#include <boost/mpl/bool.hpp>
#include <boost/mpl/if.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_concept_equivalent.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_concept_equivalent.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_concept_equivalent.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_CONCEPT_EQUIVALENT_HPP_JOFA_090830
-#define BOOST_ITL_TYPE_TRAITS_IS_CONCEPT_EQUIVALENT_HPP_JOFA_090830
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_CONCEPT_EQUIVALENT_HPP_JOFA_090830
+#define BOOST_ICL_TYPE_TRAITS_IS_CONCEPT_EQUIVALENT_HPP_JOFA_090830
#include <boost/mpl/and.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_CONTAINER_HPP_JOFA_100828
-#define BOOST_ITL_TYPE_TRAITS_IS_CONTAINER_HPP_JOFA_100828
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_CONTAINER_HPP_JOFA_100828
+#define BOOST_ICL_TYPE_TRAITS_IS_CONTAINER_HPP_JOFA_100828
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_continuous.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_continuous.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_continuous.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_CONTINUOUS_HPP_JOFA_080910
-#define BOOST_ITL_TYPE_TRAITS_IS_CONTINUOUS_HPP_JOFA_080910
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_CONTINUOUS_HPP_JOFA_080910
+#define BOOST_ICL_TYPE_TRAITS_IS_CONTINUOUS_HPP_JOFA_080910
#include <string>
#include <boost/mpl/not.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_continuous_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_continuous_interval.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_continuous_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_CONTINUOUS_INTERVAL_HPP_JOFA_100331
-#define BOOST_ITL_TYPE_TRAITS_IS_CONTINUOUS_INTERVAL_HPP_JOFA_100331
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_CONTINUOUS_INTERVAL_HPP_JOFA_100331
+#define BOOST_ICL_TYPE_TRAITS_IS_CONTINUOUS_INTERVAL_HPP_JOFA_100331
#include <boost/itl/type_traits/is_interval.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_discrete.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_discrete.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_discrete.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_DISCRETE_HPP_JOFA_100410
-#define BOOST_ITL_TYPE_TRAITS_IS_DISCRETE_HPP_JOFA_100410
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_DISCRETE_HPP_JOFA_100410
+#define BOOST_ICL_TYPE_TRAITS_IS_DISCRETE_HPP_JOFA_100410
#include <string>
#include <boost/config.hpp> // For macro BOOST_STATIC_CONSTANT
Modified: sandbox/itl/boost/itl/type_traits/is_discrete_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_discrete_interval.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_discrete_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_DISCRETE_INTERVAL_HPP_JOFA_100327
-#define BOOST_ITL_TYPE_TRAITS_IS_DISCRETE_INTERVAL_HPP_JOFA_100327
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_DISCRETE_INTERVAL_HPP_JOFA_100327
+#define BOOST_ICL_TYPE_TRAITS_IS_DISCRETE_INTERVAL_HPP_JOFA_100327
#include <boost/itl/type_traits/is_interval.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_element_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_element_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_element_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_ELEMENT_CONTAINER_HPP_JOFA_090830
-#define BOOST_ITL_TYPE_TRAITS_IS_ELEMENT_CONTAINER_HPP_JOFA_090830
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_ELEMENT_CONTAINER_HPP_JOFA_090830
+#define BOOST_ICL_TYPE_TRAITS_IS_ELEMENT_CONTAINER_HPP_JOFA_090830
#include <boost/mpl/and.hpp>
#include <boost/mpl/or.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_icl_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_icl_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_icl_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_ICL_CONTAINER_HPP_JOFA_100831
-#define BOOST_ITL_TYPE_TRAITS_IS_ICL_CONTAINER_HPP_JOFA_100831
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_ICL_CONTAINER_HPP_JOFA_100831
+#define BOOST_ICL_TYPE_TRAITS_IS_ICL_CONTAINER_HPP_JOFA_100831
#include <boost/mpl/and.hpp>
#include <boost/mpl/or.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_interval.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_HPP_JOFA_100327
-#define BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_HPP_JOFA_100327
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_HPP_JOFA_100327
+#define BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_HPP_JOFA_100327
#include <boost/itl/interval_bounds.hpp>
#include <boost/itl/interval_traits.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_interval_container.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_interval_container.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_interval_container.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_CONTAINER_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_CONTAINER_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_CONTAINER_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_CONTAINER_HPP_JOFA_081004
#include <boost/mpl/and.hpp>
#include <boost/mpl/not.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_interval_joiner.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_interval_joiner.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_interval_joiner.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_JOINER_HPP_JOFA_100901
-#define BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_JOINER_HPP_JOFA_100901
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_JOINER_HPP_JOFA_100901
+#define BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_JOINER_HPP_JOFA_100901
#include <boost/config.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_interval_separator.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_interval_separator.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_interval_separator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_SEPARATOR_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_SEPARATOR_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_SEPARATOR_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_SEPARATOR_HPP_JOFA_081004
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/is_interval_splitter.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_interval_splitter.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_interval_splitter.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_SPLITTER_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_IS_INTERVAL_SPLITTER_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_SPLITTER_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_IS_INTERVAL_SPLITTER_HPP_JOFA_081004
#include <boost/config.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_key_container_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_key_container_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_key_container_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_KEY_CONTAINER_OF_HPP_JOFA_100829
-#define BOOST_ITL_TYPE_TRAITS_IS_KEY_CONTAINER_OF_HPP_JOFA_100829
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_KEY_CONTAINER_OF_HPP_JOFA_100829
+#define BOOST_ICL_TYPE_TRAITS_IS_KEY_CONTAINER_OF_HPP_JOFA_100829
#include <boost/itl/type_traits/is_combinable.hpp>
#include <boost/itl/type_traits/is_container.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_map.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_MAP_HPP_JOFA_081107
-#define BOOST_ITL_TYPE_TRAITS_IS_MAP_HPP_JOFA_081107
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_MAP_HPP_JOFA_081107
+#define BOOST_ICL_TYPE_TRAITS_IS_MAP_HPP_JOFA_081107
#include <boost/config.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_numeric.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_numeric.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_numeric.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_NUMERIC_HPP_JOFA_100322
-#define BOOST_ITL_TYPE_TRAITS_IS_NUMERIC_HPP_JOFA_100322
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_NUMERIC_HPP_JOFA_100322
+#define BOOST_ICL_TYPE_TRAITS_IS_NUMERIC_HPP_JOFA_100322
#include <limits>
#include <complex>
Modified: sandbox/itl/boost/itl/type_traits/is_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_set.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_SET_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_IS_SET_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_SET_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_IS_SET_HPP_JOFA_081004
#include <boost/config.hpp>
Modified: sandbox/itl/boost/itl/type_traits/is_total.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/is_total.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/is_total.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_IS_TOTAL_HPP_JOFA_081004
-#define BOOST_ITL_TYPE_TRAITS_IS_TOTAL_HPP_JOFA_081004
+#ifndef BOOST_ICL_TYPE_TRAITS_IS_TOTAL_HPP_JOFA_081004
+#define BOOST_ICL_TYPE_TRAITS_IS_TOTAL_HPP_JOFA_081004
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/no_type.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/no_type.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/no_type.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_NO_TYPE_HPP_JOFA_100902
-#define BOOST_ITL_TYPE_TRAITS_NO_TYPE_HPP_JOFA_100902
+#ifndef BOOST_ICL_TYPE_TRAITS_NO_TYPE_HPP_JOFA_100902
+#define BOOST_ICL_TYPE_TRAITS_NO_TYPE_HPP_JOFA_100902
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/segment_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/segment_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/segment_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_SEGMENT_TYPE_OF_HPP_JOFA_100902
-#define BOOST_ITL_TYPE_TRAITS_SEGMENT_TYPE_OF_HPP_JOFA_100902
+#ifndef BOOST_ICL_TYPE_TRAITS_SEGMENT_TYPE_OF_HPP_JOFA_100902
+#define BOOST_ICL_TYPE_TRAITS_SEGMENT_TYPE_OF_HPP_JOFA_100902
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/itl/boost/itl/type_traits/size.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/size.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/size.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_SIZE_HPP_JOFA_080911
-#define BOOST_ITL_TYPE_TRAITS_SIZE_HPP_JOFA_080911
+#ifndef BOOST_ICL_TYPE_TRAITS_SIZE_HPP_JOFA_080911
+#define BOOST_ICL_TYPE_TRAITS_SIZE_HPP_JOFA_080911
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/size_type_of.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/size_type_of.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/size_type_of.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_SIZE_TYPE_OF_HPP_JOFA_080911
-#define BOOST_ITL_TYPE_TRAITS_SIZE_TYPE_OF_HPP_JOFA_080911
+#ifndef BOOST_ICL_TYPE_TRAITS_SIZE_TYPE_OF_HPP_JOFA_080911
+#define BOOST_ICL_TYPE_TRAITS_SIZE_TYPE_OF_HPP_JOFA_080911
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/succ_pred.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/succ_pred.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/succ_pred.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_SUCC_PRED_HPP_JOFA_080913
-#define BOOST_ITL_TYPE_TRAITS_SUCC_PRED_HPP_JOFA_080913
+#ifndef BOOST_ICL_TYPE_TRAITS_SUCC_PRED_HPP_JOFA_080913
+#define BOOST_ICL_TYPE_TRAITS_SUCC_PRED_HPP_JOFA_080913
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl/type_traits/to_string.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/to_string.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/to_string.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -13,8 +13,8 @@
any class that provides a ++ operator c.f. iterators
-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TO_STRING_HPP_JOFA_000712
-#define BOOST_ITL_TO_STRING_HPP_JOFA_000712
+#ifndef BOOST_ICL_TO_STRING_HPP_JOFA_000712
+#define BOOST_ICL_TO_STRING_HPP_JOFA_000712
#include <stdio.h>
#include <string>
Modified: sandbox/itl/boost/itl/type_traits/type_to_string.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/type_to_string.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/type_to_string.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TO_STRING_HPP_JOFA_080416
-#define BOOST_ITL_TYPE_TO_STRING_HPP_JOFA_080416
+#ifndef BOOST_ICL_TYPE_TO_STRING_HPP_JOFA_080416
+#define BOOST_ICL_TYPE_TO_STRING_HPP_JOFA_080416
#include <stdio.h>
#include <string>
Modified: sandbox/itl/boost/itl/type_traits/unit_element.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/unit_element.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/unit_element.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPE_TRAITS_UNIT_ELEMENT_HPP_JOFA_080912
-#define BOOST_ITL_TYPE_TRAITS_UNIT_ELEMENT_HPP_JOFA_080912
+#ifndef BOOST_ICL_TYPE_TRAITS_UNIT_ELEMENT_HPP_JOFA_080912
+#define BOOST_ICL_TYPE_TRAITS_UNIT_ELEMENT_HPP_JOFA_080912
#include <string>
#include <boost/itl/type_traits/identity_element.hpp>
Modified: sandbox/itl/boost/itl/type_traits/value_size.hpp
==============================================================================
--- sandbox/itl/boost/itl/type_traits/value_size.hpp (original)
+++ sandbox/itl/boost/itl/type_traits/value_size.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALUE_SIZE_HPP_JOFA_081004
-#define BOOST_ITL_VALUE_SIZE_HPP_JOFA_081004
+#ifndef BOOST_ICL_VALUE_SIZE_HPP_JOFA_081004
+#define BOOST_ICL_VALUE_SIZE_HPP_JOFA_081004
namespace boost{ namespace icl
{
Modified: sandbox/itl/boost/itl_xt/bits.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/bits.hpp (original)
+++ sandbox/itl/boost/itl_xt/bits.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_BITS_HPP_JOFA_091023
-#define BOOST_ITL_XT_BITS_HPP_JOFA_091023
+#ifndef BOOST_ICL_XT_BITS_HPP_JOFA_091023
+#define BOOST_ICL_XT_BITS_HPP_JOFA_091023
#include <limits>
#include <boost/static_assert.hpp>
@@ -250,4 +250,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_BITS_HPP_JOFA_091023
+#endif // BOOST_ICL_XT_BITS_HPP_JOFA_091023
Modified: sandbox/itl/boost/itl_xt/bits_gentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/bits_gentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/bits_gentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_BITS_GENTOR_HPP_JOFA_091009
-#define BOOST_ITL_XT_BITS_GENTOR_HPP_JOFA_091009
+#ifndef BOOST_ICL_XT_BITS_GENTOR_HPP_JOFA_091009
+#define BOOST_ICL_XT_BITS_GENTOR_HPP_JOFA_091009
#include <boost/itl/type_traits/to_string.hpp>
#include <boost/itl_xt/gentorit.hpp>
Modified: sandbox/itl/boost/itl_xt/detail/bit_element_iterator.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/detail/bit_element_iterator.hpp (original)
+++ sandbox/itl/boost/itl_xt/detail/bit_element_iterator.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -8,8 +8,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
-#define BOOST_ITL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
+#ifndef BOOST_ICL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
+#define BOOST_ICL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
#include <boost/itl_xt/bits.hpp>
#include <boost/mpl/not.hpp>
@@ -20,7 +20,7 @@
//------------------------------------------------------------------------------
template<class SegmentT> struct bitwise;
-template<class DomainT, ITL_COMPARE Compare, template<class, ITL_COMPARE>class Interval, class BitSetT>
+template<class DomainT, ICL_COMPARE Compare, template<class, ICL_COMPARE>class Interval, class BitSetT>
struct bitwise<std::pair<Interval<DomainT,Compare>const, BitSetT> >
{
typedef bitwise type;
@@ -512,7 +512,7 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
+#endif // BOOST_ICL_XT_DETAIL_BIT_ELEMENT_ITERATOR_HPP_JOFA_091109
Modified: sandbox/itl/boost/itl_xt/enum_bitset.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/enum_bitset.hpp (original)
+++ sandbox/itl/boost/itl_xt/enum_bitset.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_ENUM_BITSET_HPP_JOFA_021204
-#define BOOST_ITL_ENUM_BITSET_HPP_JOFA_021204
+#ifndef BOOST_ICL_ENUM_BITSET_HPP_JOFA_021204
+#define BOOST_ICL_ENUM_BITSET_HPP_JOFA_021204
#include <bitset>
#include <boost/itl/detail/notate.hpp>
@@ -57,5 +57,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_ENUM_BITSET_HPP_JOFA_021204
+#endif // BOOST_ICL_ENUM_BITSET_HPP_JOFA_021204
Modified: sandbox/itl/boost/itl_xt/episode_product.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/episode_product.hpp (original)
+++ sandbox/itl/boost/itl_xt/episode_product.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
-#define BOOST_ITL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
+#ifndef BOOST_ICL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
+#define BOOST_ICL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
#include <boost/itl/map.hpp>
#include <boost/itl_xt/episode_set.hpp>
@@ -145,13 +145,13 @@
void leftAlignedEpisodes(episode_product& syncProd, const TimeT& start)
{
- ITL_const_FORALL_THIS(elem_)
+ ICL_const_FORALL_THIS(elem_)
{
TypeDomain type = (*elem_).first;
EpisodeSetTD& epiSet = (*elem_).first;
EpisodeSetTD syncSet;
- ITL_const_FORALL(typename EpisodeSetTD, epi_, epiSet)
+ ICL_const_FORALL(typename EpisodeSetTD, epi_, epiSet)
{
if((*epi_)->interval().first()==start)
syncSet.insert(*epi_);
@@ -292,6 +292,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
+#endif // BOOST_ICL_EPISODE_PRODUCT_HPP_HPP_JOFA_011005
Modified: sandbox/itl/boost/itl_xt/episode_set.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/episode_set.hpp (original)
+++ sandbox/itl/boost/itl_xt/episode_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_EPISODE_SET_HPP_HPP_JOFA_011015
-#define BOOST_ITL_EPISODE_SET_HPP_HPP_JOFA_011015
+#ifndef BOOST_ICL_EPISODE_SET_HPP_HPP_JOFA_011015
+#define BOOST_ICL_EPISODE_SET_HPP_HPP_JOFA_011015
#include <string>
#include <boost/itl/set.hpp>
@@ -68,7 +68,7 @@
*/
template <class TimeT, class TypeDomain>
class episode_set : public icl::set<typed_episode<TimeT, TypeDomain>*,
-#ifdef ITL_USE_COMPARE_TEMPLATE_TEMPLATE
+#ifdef ICL_USE_COMPARE_TEMPLATE_TEMPLATE
Less_TypedEpisodeATP
#else
Less_TypedEpisodeATP<typed_episode<TimeT, TypeDomain>*>
@@ -79,7 +79,7 @@
public:
typedef typed_episode<TimeT, TypeDomain>* episode_type;
typedef icl::set<typed_episode<TimeT, TypeDomain>*,
- ITL_COMPARE_INSTANCE(Less_TypedEpisodeATP,episode_type)> base_type;
+ ICL_COMPARE_INSTANCE(Less_TypedEpisodeATP,episode_type)> base_type;
typedef typename base_type::iterator iterator;
typedef typename base_type::const_iterator const_iterator;
@@ -131,6 +131,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_EPISODE_SET_HPP_HPP_JOFA_011015
+#endif // BOOST_ICL_EPISODE_SET_HPP_HPP_JOFA_011015
Modified: sandbox/itl/boost/itl_xt/fixtupelconst.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/fixtupelconst.hpp (original)
+++ sandbox/itl/boost/itl_xt/fixtupelconst.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -26,8 +26,8 @@
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FIXTUPELCONSTT_HPP_JOFA_040621
-#define BOOST_ITL_FIXTUPELCONSTT_HPP_JOFA_040621
+#ifndef BOOST_ICL_FIXTUPELCONSTT_HPP_JOFA_040621
+#define BOOST_ICL_FIXTUPELCONSTT_HPP_JOFA_040621
#include <boost/itl/detail/notate.hpp>
@@ -43,6 +43,6 @@
const GroupVarTD UNDEFINED_GROUP = -1;
}} // namespace icl boost
-#endif // BOOST_ITL_FIXTUPELCONSTT_HPP_JOFA_040621
+#endif // BOOST_ICL_FIXTUPELCONSTT_HPP_JOFA_040621
Modified: sandbox/itl/boost/itl_xt/interval_bitset.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/interval_bitset.hpp (original)
+++ sandbox/itl/boost/itl_xt/interval_bitset.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_INTERVAL_BITSET_HPP_JOFA_091023
-#define BOOST_ITL_XT_INTERVAL_BITSET_HPP_JOFA_091023
+#ifndef BOOST_ICL_XT_INTERVAL_BITSET_HPP_JOFA_091023
+#define BOOST_ICL_XT_INTERVAL_BITSET_HPP_JOFA_091023
#include <iostream> // to organize output
#include <boost/cstdint.hpp> // portable boost integers
@@ -42,9 +42,9 @@
<
typename DomainT = unsigned long,
typename BitSetT = icl::bits<unsigned long>,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare), //JODO change to right_open_interval
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare), //JODO change to right_open_interval
+ ICL_ALLOC Alloc = std::allocator
>
class interval_bitset
: boost::equality_comparable < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>
@@ -62,11 +62,11 @@
, boost::andable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, DomainT
, boost::xorable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, DomainT
- , boost::addable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::orable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::subtractable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::andable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::xorable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::addable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::orable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::subtractable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::andable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::xorable2 < interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
> > > > > > > > > > > > > > > > >
//^ & - | + ^ & - | + ^ & - | + < ==
//segment element container
@@ -294,7 +294,7 @@
};
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::PartsT
interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::partition
(
@@ -348,7 +348,7 @@
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::contains(const segment_type& segment)const
{
if(segment.empty())
@@ -374,18 +374,18 @@
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::size_type
interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::cardinality()const
{
size_type cardinality = 0;
- ITL_const_FORALL(typename interval_bitmap_type, it_, _map)
+ ICL_const_FORALL(typename interval_bitmap_type, it_, _map)
cardinality += (it_->second.cardinality() * icl::cardinality(it_->first));
return cardinality;
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
void interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::show_segments()const
{
for(typename interval_bitmap_type::const_iterator it_ = _map.begin();
@@ -397,7 +397,7 @@
}
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
void interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::show_matrix(const char off_on[2])const
{
typename interval_bitmap_type::const_iterator iter = _map.begin();
@@ -411,82 +411,82 @@
}
//------------------------------------------------------------------------------
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_iterator
elements_begin(interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_begin(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_iterator
elements_end(interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_end(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_const_iterator
elements_begin(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_begin(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_const_iterator
elements_end(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_end(); }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_reverse_iterator
elements_rbegin(interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_rbegin(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_reverse_iterator
elements_rend(interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_rend(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_const_reverse_iterator
elements_rbegin(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_rbegin(); }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_const_reverse_iterator
elements_rend(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{ return object.elements_rend(); }
//------------------------------------------------------------------------------
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool is_element_equal(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& left,
const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& right)
{ return left == right; }
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
void clear(interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{
object.clear();
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool is_empty(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{
return object.empty();
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool contains(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& super,
const typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::element_type& sub )
{
return super.contains(sub);
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool contains(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& super,
const typename interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>::segment_type& sub )
{
return super.contains(sub);
}
-template<class DomainT, class BitSetT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval, ITL_ALLOC Alloc>
+template<class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
bool contains(const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& super,
const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& sub )
{
@@ -496,14 +496,14 @@
template<class CharType, class CharTraits,
class DomainT, class BitSetT,
- ITL_COMPARE Compare, template<class,ITL_COMPARE>class Interval, ITL_ALLOC Alloc>
+ ICL_COMPARE Compare, template<class,ICL_COMPARE>class Interval, ICL_ALLOC Alloc>
std::basic_ostream<CharType, CharTraits>& operator <<
(std::basic_ostream<CharType, CharTraits>& stream,
const interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc>& object)
{
typedef interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc> ObjectT;
stream << "{";
- ITL_const_FORALL(typename ObjectT, it_, object)
+ ICL_const_FORALL(typename ObjectT, it_, object)
stream << "(" << it_->first << "->" << it_->second << ")";
return stream << "}";
@@ -513,7 +513,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, class BitSetT, ITL_COMPARE Compare, template<class,ITL_COMPARE>class Interval, ITL_ALLOC Alloc>
+template <class DomainT, class BitSetT, ICL_COMPARE Compare, template<class,ICL_COMPARE>class Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc> >
{
static std::string apply()
@@ -543,7 +543,7 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_INTERVAL_BITSET_HPP_JOFA_091023
+#endif // BOOST_ICL_XT_INTERVAL_BITSET_HPP_JOFA_091023
Modified: sandbox/itl/boost/itl_xt/list.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/list.hpp (original)
+++ sandbox/itl/boost/itl_xt/list.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,8 +12,8 @@
a general list class that extends stl-lists
for concepts InplaceAddable and InplaceSubtractable
--------------------------------------------------------------------*/
-#ifndef BOOST_ITL_LIST_HPP_JOFA_070519
-#define BOOST_ITL_LIST_HPP_JOFA_070519
+#ifndef BOOST_ICL_LIST_HPP_JOFA_070519
+#define BOOST_ICL_LIST_HPP_JOFA_070519
#include <string>
#include <list>
@@ -34,7 +34,7 @@
@author Joachim Faulhaber
*/
- template <typename DataT, ITL_ALLOC Alloc = std::allocator>
+ template <typename DataT, ICL_ALLOC Alloc = std::allocator>
class list: private std::list<DataT, Alloc<DataT> >
{
public:
@@ -199,7 +199,7 @@
};
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
inline bool operator == (const icl::list<DataT,Alloc>& lhs,
const icl::list<DataT,Alloc>& rhs)
{
@@ -207,7 +207,7 @@
return operator==((const base_type&)lhs, (const base_type&)rhs);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
inline bool operator < (const icl::list<DataT,Alloc>& lhs,
const icl::list<DataT,Alloc>& rhs)
{
@@ -215,7 +215,7 @@
return operator<((const base_type&)lhs, (const base_type&)rhs);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
inline bool operator <= (const icl::list<DataT,Alloc>& lhs,
const icl::list<DataT,Alloc>& rhs)
{
@@ -223,7 +223,7 @@
return operator<=((const base_type&)lhs, (const base_type&)rhs);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::is_unique()const
{
//JODO implement via std-algorithm of directly
@@ -232,7 +232,7 @@
return (*this) == self;
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::is_supersequence(const list& subSeq)const
{
list sub = subSeq;
@@ -240,7 +240,7 @@
return is_supersequence(sub, pos);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::is_supersequence(list& subtee, const_iterator& pos)const
{
if(subtee.empty())
@@ -260,7 +260,7 @@
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::is_consequent(const list& conSeq)const
{
list seq = conSeq;
@@ -269,7 +269,7 @@
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::is_consequent(list& seq, const_iterator& pos)const
{
if(seq.empty())
@@ -289,7 +289,7 @@
}
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
void list<DataT,Alloc>::consequent_permutation(list& perm, list& seq)
{
perm.clear();
@@ -298,7 +298,7 @@
consequent_permutation(perm, this_, seq, seq_);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
void list<DataT,Alloc>::consequent_permutation(list& perm, iterator& this_, list& seq, iterator& seq_)
{
if(seq_ == seq.end())
@@ -339,7 +339,7 @@
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
typename list<DataT,Alloc>::iterator list<DataT,Alloc>::first_common_element
(iterator& beg1_, iterator& end1_, iterator& beg2_, iterator& end2_)const
{
@@ -353,7 +353,7 @@
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
void list<DataT,Alloc>::interlace(const list& inList)
{
BOOST_ASSERT(is_unique());
@@ -363,7 +363,7 @@
interlace(seq, inPos);
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
void list<DataT,Alloc>::interlace(list& seq, iterator& inPos)
{
if(seq.empty())
@@ -393,7 +393,7 @@
// THINK: here codereplication occurs at the next level of abstraction (cf. SetT)
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
bool list<DataT,Alloc>::any(const property<DataT>& pred)const
{
const_iterator it = begin();
@@ -402,7 +402,7 @@
}
- template <typename DataT, ITL_ALLOC Alloc>
+ template <typename DataT, ICL_ALLOC Alloc>
std::string list<DataT,Alloc>::as_string(const char* sep /* =" " */)const
{
const_iterator it=begin();
@@ -426,7 +426,7 @@
//= Streaming
//==============================================================================
template<class CharType, class CharTraits,
- class DataT, ITL_ALLOC Alloc>
+ class DataT, ICL_ALLOC Alloc>
std::basic_ostream<CharType, CharTraits>& operator <<
(std::basic_ostream<CharType, CharTraits>& stream,
const icl::list<DataT,Alloc>& object)
@@ -453,5 +453,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_LIST_HPP_JOFA_070519
+#endif // BOOST_ICL_LIST_HPP_JOFA_070519
Modified: sandbox/itl/boost/itl_xt/map_segment_gentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/map_segment_gentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/map_segment_gentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
-#define BOOST_ITL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
+#ifndef BOOST_ICL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
+#define BOOST_ICL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
#include <boost/itl_xt/gentorit.hpp>
@@ -69,7 +69,7 @@
value = segment_type(inter_val, co_val);
};
-}} // BOOST_ITL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
+}} // BOOST_ICL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
#endif
Modified: sandbox/itl/boost/itl_xt/mapgentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/mapgentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/mapgentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_MAPGENTOR_HPP_JOFA_000724
-#define BOOST_ITL_XT_MAPGENTOR_HPP_JOFA_000724
+#ifndef BOOST_ICL_XT_MAPGENTOR_HPP_JOFA_000724
+#define BOOST_ICL_XT_MAPGENTOR_HPP_JOFA_000724
#include <boost/itl_xt/list.hpp>
#include <boost/itl_xt/gentorit.hpp>
@@ -85,7 +85,7 @@
void MapGentorT<MapTV>::last(MapTV& x)const
{
x.clear();
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
x += *it;
}
@@ -97,13 +97,13 @@
SampleTypeTD perm;
NumberGentorT<int> intGentor;
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor(2) ) perm.push_back(*it);
else perm.push_front(*it);
}
- ITL_const_FORALL(typename SampleTypeTD, pit, perm)
+ ICL_const_FORALL(typename SampleTypeTD, pit, perm)
x += *pit;
}
@@ -120,7 +120,7 @@
NumberGentorT<unsigned> intGentor;
x.clear();
int coin = intGentor.some(2); // gives 0 or 1
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor.some(2) ) sam.push_back(*it);
else sam.push_front(*it);
@@ -130,6 +130,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_MAPGENTOR_HPP_JOFA_000724
+#endif // BOOST_ICL_XT_MAPGENTOR_HPP_JOFA_000724
Modified: sandbox/itl/boost/itl_xt/meta_log.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/meta_log.hpp (original)
+++ sandbox/itl/boost/itl_xt/meta_log.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_META_LOG_HPP_JOFA_091023
-#define BOOST_ITL_XT_META_LOG_HPP_JOFA_091023
+#ifndef BOOST_ICL_XT_META_LOG_HPP_JOFA_091023
+#define BOOST_ICL_XT_META_LOG_HPP_JOFA_091023
namespace boost{namespace icl
{
@@ -27,4 +27,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_META_LOG_HPP_JOFA_091023
+#endif // BOOST_ICL_XT_META_LOG_HPP_JOFA_091023
Modified: sandbox/itl/boost/itl_xt/prefix_set.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/prefix_set.hpp (original)
+++ sandbox/itl/boost/itl_xt/prefix_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_PREFIX_SET_HPP_JOFA_040902
-#define BOOST_ITL_PREFIX_SET_HPP_JOFA_040902
+#ifndef BOOST_ICL_PREFIX_SET_HPP_JOFA_040902
+#define BOOST_ICL_PREFIX_SET_HPP_JOFA_040902
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/string_set.hpp>
@@ -110,5 +110,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_PREFIX_SET_HPP_JOFA_040902
+#endif // BOOST_ICL_PREFIX_SET_HPP_JOFA_040902
Modified: sandbox/itl/boost/itl_xt/seqgentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/seqgentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/seqgentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -109,7 +109,7 @@
void SeqGentorT<SeqTV>::last(SeqTV& x)const
{
x.clear();
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
}
template <class SeqTV>
@@ -120,13 +120,13 @@
SampleTypeTD perm;
NumberGentorT<int> intGentor;
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor(2) ) perm.push_back(*it);
else perm.push_front(*it);
}
- ITL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
+ ICL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
}
@@ -142,7 +142,7 @@
NumberGentorT<unsigned> intGentor;
x.clear();
int coin = intGentor.some(2); // gives 0 or 1
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor.some(2) ) sam.push_back(*it);
else sam.push_front(*it);
Modified: sandbox/itl/boost/itl_xt/setgentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/setgentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/setgentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -103,7 +103,7 @@
void SetGentorT<SetTV>::last(SetTV& x)const
{
x.clear();
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
x += *it;
}
@@ -115,13 +115,13 @@
SampleTypeTD perm;
NumberGentorT<int> intGentor;
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor(2) ) perm.push_back(*it);
else perm.push_front(*it);
}
- ITL_const_FORALL(typename SampleTypeTD, pit, perm)
+ ICL_const_FORALL(typename SampleTypeTD, pit, perm)
x += *pit;
}
@@ -138,7 +138,7 @@
NumberGentorT<unsigned> intGentor;
x.clear();
int coin = intGentor.some(2); // gives 0 or 1
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor.some(2) ) sam.push_back(*it);
else sam.push_front(*it);
Modified: sandbox/itl/boost/itl_xt/std/pair.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/std/pair.hpp (original)
+++ sandbox/itl/boost/itl_xt/std/pair.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -11,8 +11,8 @@
/*-----------------------------------------------------------------------------+
Additions to std::pair
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_STD_PAIR_HPP_JOFA_091006
-#define BOOST_ITL_XT_STD_PAIR_HPP_JOFA_091006
+#ifndef BOOST_ICL_XT_STD_PAIR_HPP_JOFA_091006
+#define BOOST_ICL_XT_STD_PAIR_HPP_JOFA_091006
#include <boost/itl/type_traits/type_to_string.hpp>
@@ -36,5 +36,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_XT_STD_PAIR_HPP_JOFA_091006
+#endif // BOOST_ICL_XT_STD_PAIR_HPP_JOFA_091006
Modified: sandbox/itl/boost/itl_xt/std/pair_gentor.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/std/pair_gentor.hpp (original)
+++ sandbox/itl/boost/itl_xt/std/pair_gentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_XT_STD_PAIR_GENTOR_HPP_JOFA_091009
-#define BOOST_ITL_XT_STD_PAIR_GENTOR_HPP_JOFA_091009
+#ifndef BOOST_ICL_XT_STD_PAIR_GENTOR_HPP_JOFA_091009
+#define BOOST_ICL_XT_STD_PAIR_GENTOR_HPP_JOFA_091009
#include <boost/itl/type_traits/to_string.hpp>
#include <boost/itl_xt/std/pair.hpp>
Modified: sandbox/itl/boost/itl_xt/string_list.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/string_list.hpp (original)
+++ sandbox/itl/boost/itl_xt/string_list.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -33,8 +33,8 @@
Can be useful for string split and join.
Also simple text-formating can be done.
--------------------------------------------------------------------*/
-#ifndef BOOST_ITL_STRING_LIST_HPP_JOFA_990603
-#define BOOST_ITL_STRING_LIST_HPP_JOFA_990603
+#ifndef BOOST_ICL_STRING_LIST_HPP_JOFA_990603
+#define BOOST_ICL_STRING_LIST_HPP_JOFA_990603
#include <string>
#include <list>
Modified: sandbox/itl/boost/itl_xt/string_map.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/string_map.hpp (original)
+++ sandbox/itl/boost/itl_xt/string_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -25,8 +25,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_STRING_MAP_HPP_JOFA_021215
-#define BOOST_ITL_STRING_MAP_HPP_JOFA_021215
+#ifndef BOOST_ICL_STRING_MAP_HPP_JOFA_021215
+#define BOOST_ICL_STRING_MAP_HPP_JOFA_021215
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/map.hpp>
@@ -55,7 +55,7 @@
};
}} // namespace boost icl
-#endif // BOOST_ITL_STRING_MAP_HPP_JOFA_021215
+#endif // BOOST_ICL_STRING_MAP_HPP_JOFA_021215
Modified: sandbox/itl/boost/itl_xt/string_set.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/string_set.hpp (original)
+++ sandbox/itl/boost/itl_xt/string_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -28,8 +28,8 @@
/*---------------------------------------------------------------------------------
set of strings
---------------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_STRING_SET_HPP_JOFA_990318
-#define BOOST_ITL_STRING_SET_HPP_JOFA_990318
+#ifndef BOOST_ICL_STRING_SET_HPP_JOFA_990318
+#define BOOST_ICL_STRING_SET_HPP_JOFA_990318
#include <string>
#include <string.h>
@@ -57,7 +57,7 @@
// sets of strings
// ---------------------------------------------------------------------------------
- template <ITL_COMPARE Compare = std::less>
+ template <ICL_COMPARE Compare = std::less>
class string_set: public icl::set<std::string, Compare>
{
public:
@@ -79,7 +79,7 @@
typedef string_set<String_ICLess> ICstring_setD;
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
std::string string_set<Compare>::as_string(char* sep)const
{
const_iterator it = this->begin();
@@ -93,11 +93,11 @@
}
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
void string_set<Compare>::selectSet(string_set& selectees, StringSelectorFPD selector)const
{
selectees.clear();
- ITL_const_FORALL_THIS(it)
+ ICL_const_FORALL_THIS(it)
selectees.insert(((*it).*selector)());
}
}} // namespace boost icl
Modified: sandbox/itl/boost/itl_xt/string_sheet.cpp
==============================================================================
--- sandbox/itl/boost/itl_xt/string_sheet.cpp (original)
+++ sandbox/itl/boost/itl_xt/string_sheet.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -49,7 +49,7 @@
void string_sheet::fprint(FILE* file, const char* sep)const
{
- ITL_const_FORALL_THIS(row_)
+ ICL_const_FORALL_THIS(row_)
{
const string_list& row = (*row_);
fprintf(file, "%s\n", row.join(sep).c_str());
Modified: sandbox/itl/boost/itl_xt/string_sheet.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/string_sheet.hpp (original)
+++ sandbox/itl/boost/itl_xt/string_sheet.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -25,8 +25,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_STRING_SHEET_HPP_JOFA_050209
-#define BOOST_ITL_STRING_SHEET_HPP_JOFA_050209
+#ifndef BOOST_ICL_STRING_SHEET_HPP_JOFA_050209
+#define BOOST_ICL_STRING_SHEET_HPP_JOFA_050209
#include <iostream>
#include <fstream>
@@ -84,5 +84,5 @@
};
}} // namespace icl boost
-#endif // BOOST_ITL_STRING_SHEET_HPP_JOFA_050209
+#endif // BOOST_ICL_STRING_SHEET_HPP_JOFA_050209
Modified: sandbox/itl/boost/itl_xt/stringpattern_set.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/stringpattern_set.hpp (original)
+++ sandbox/itl/boost/itl_xt/stringpattern_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_STRINGPATTERN_SET_HPP_JOFA_040902
-#define BOOST_ITL_STRINGPATTERN_SET_HPP_JOFA_040902
+#ifndef BOOST_ICL_STRINGPATTERN_SET_HPP_JOFA_040902
+#define BOOST_ICL_STRINGPATTERN_SET_HPP_JOFA_040902
#include "prefix_set.h"
namespace boost{namespace icl
@@ -67,6 +67,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_STRINGPATTERN_SET_HPP_JOFA_040902
+#endif // BOOST_ICL_STRINGPATTERN_SET_HPP_JOFA_040902
Modified: sandbox/itl/boost/itl_xt/tuple_computer.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/tuple_computer.hpp (original)
+++ sandbox/itl/boost/itl_xt/tuple_computer.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -224,7 +224,7 @@
template <int VarCount, class CounterT>
void tuple_computer_base<VarCount, CounterT>::addDomain(tuple_set_type& domain)const
{
- ITL_const_FORALL_THIS(tupel_)
+ ICL_const_FORALL_THIS(tupel_)
domain.insert((*tupel_).first);
}
@@ -280,7 +280,7 @@
void alignFor(const tuple_set_type& domain)
{
- ITL_const_FORALL(typename tuple_set_type, it_, domain)
+ ICL_const_FORALL(typename tuple_set_type, it_, domain)
this->insert(*it_, CounteeT());
}
@@ -290,7 +290,7 @@
void amount_tuple_computer<VarCount, CounterT>::load(const tuple_computer_interface<VarCount>& srcI)
{
const amount_tuple_computer& src = dynamic_cast<const amount_tuple_computer&>(srcI);
- ITL_const_FORALL(typename amount_tuple_computer, it_, src)
+ ICL_const_FORALL(typename amount_tuple_computer, it_, src)
this->insert(*it_);
}
@@ -329,7 +329,7 @@
void alignFor(const tuple_set_type& domain)
{
- ITL_const_FORALL(typename tuple_set_type, it_, domain)
+ ICL_const_FORALL(typename tuple_set_type, it_, domain)
insert(*it_, counter_type());
}
@@ -339,7 +339,7 @@
void date_tuple_computer<VarCount,TimeT,CounteeT>::load(const tuple_computer_interface<VarCount>& srcI)
{
const date_tuple_computer& src = dynamic_cast<const date_tuple_computer&>(srcI);
- ITL_const_FORALL(typename date_tuple_computer, it_, src)
+ ICL_const_FORALL(typename date_tuple_computer, it_, src)
insert(*it_);
}
@@ -388,7 +388,7 @@
void alignFor(const tuple_set_type& domain)
{
- ITL_const_FORALL(typename tuple_set_type, it_, domain)
+ ICL_const_FORALL(typename tuple_set_type, it_, domain)
insert(*it_, counter_type());
}
};
@@ -398,7 +398,7 @@
void interval_tuple_computer<VarCount,TimeT,CounteeT>::load(const tuple_computer_interface<VarCount>& srcI)
{
const interval_tuple_computer& src = dynamic_cast<const interval_tuple_computer&>(srcI);
- ITL_const_FORALL(typename interval_tuple_computer, it_, src)
+ ICL_const_FORALL(typename interval_tuple_computer, it_, src)
insert(*it_);
}
@@ -406,7 +406,7 @@
void interval_tuple_computer<VarCount,TimeT,CounteeT>::insertDateMap(const var_tuple_type tup, const DateMapTD& date)
{
counter_type itvCounter;
- ITL_const_FORALL(typename DateMapTD, date_, date)
+ ICL_const_FORALL(typename DateMapTD, date_, date)
{
itvCounter.insert(
counter_type::value_type(
@@ -430,7 +430,7 @@
typedef interval_base_map<SubType, ItvDomTV, CodomTV> ItvMapTD;
itvMap.clear();
- ITL_const_FORALL(typename DateMapTD, date_, dateMap)
+ ICL_const_FORALL(typename DateMapTD, date_, dateMap)
{
itvMap.insert(
ItvMapTD::value_type(
@@ -460,7 +460,7 @@
ItvMapTD* aux = itvMap.cons();
//JODO OPTI: optimize using the ordering: if intervalls are beyond borders we can terminate
- ITL_const_FORALL(typename DiscItvSetTD, itv_, grid)
+ ICL_const_FORALL(typename DiscItvSetTD, itv_, grid)
{
itvMap.intersect(*aux, *itv_);
gridSums.insert(ItvMapTD::value_type(*itv_, (*aux).volume()));
Modified: sandbox/itl/boost/itl_xt/typed_episode.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/typed_episode.hpp (original)
+++ sandbox/itl/boost/itl_xt/typed_episode.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -27,8 +27,8 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TYPED_EPISODE_HPP_HPP_JOFA_011015
-#define BOOST_ITL_TYPED_EPISODE_HPP_HPP_JOFA_011015
+#ifndef BOOST_ICL_TYPED_EPISODE_HPP_HPP_JOFA_011015
+#define BOOST_ICL_TYPED_EPISODE_HPP_HPP_JOFA_011015
#include <boost/itl/type_traits/interval_type_default.hpp>
//REV #include <boost/itl/interval.hpp>
@@ -76,7 +76,7 @@
}} // namespace icl boost
-#endif // BOOST_ITL_TYPED_EPISODE_HPP_HPP_JOFA_011015
+#endif // BOOST_ICL_TYPED_EPISODE_HPP_HPP_JOFA_011015
Modified: sandbox/itl/boost/itl_xt/var_permutation.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/var_permutation.hpp (original)
+++ sandbox/itl/boost/itl_xt/var_permutation.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -240,7 +240,7 @@
master.consequent_permutation(conseq, unseq);
perm.clear();
- ITL_const_FORALL(ListTD, it_, conseq)
+ ICL_const_FORALL(ListTD, it_, conseq)
perm.add(*it_);
}
Modified: sandbox/itl/boost/itl_xt/var_tuple_order.hpp
==============================================================================
--- sandbox/itl/boost/itl_xt/var_tuple_order.hpp (original)
+++ sandbox/itl/boost/itl_xt/var_tuple_order.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -93,7 +93,7 @@
template <typename VarTupleT>
bool icl::var_tuple_order<VarTupleT>::operator() (const VarTupleT& x1, const VarTupleT& x2)const
{
- ITL_FORALL_VEC(permIdx, m_Permutation)
+ ICL_FORALL_VEC(permIdx, m_Permutation)
{
int idx = m_Permutation[permIdx];
@@ -125,7 +125,7 @@
template <typename VarTupleT>
VarEnumTD icl::var_tuple_order<VarTupleT>::indexOfFirstDifference(const VarTupleT& x1, const VarTupleT& x2)const
{
- ITL_FORALL_VEC(permIdx, m_Permutation)
+ ICL_FORALL_VEC(permIdx, m_Permutation)
{
int idx = m_Permutation[permIdx];
Modified: sandbox/itl/boost/validate/driver/abelian_monoid_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/abelian_monoid_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/abelian_monoid_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -65,7 +65,7 @@
switch(domainChoice) {
case DomainType::Int: return new abelian_monoid_validater<icl::set<int> >;
case DomainType::Double: return new abelian_monoid_validater<icl::set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -73,7 +73,7 @@
switch(domainChoice) {
case DomainType::Int: return new abelian_monoid_validater<interval_set<int> >;
case DomainType::Double: return new abelian_monoid_validater<interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -81,11 +81,11 @@
switch(domainChoice) {
case DomainType::Int: return new abelian_monoid_validater<split_interval_set<int> >;
case DomainType::Double: return new abelian_monoid_validater<split_interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
};
Modified: sandbox/itl/boost/validate/driver/bit_collector_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/bit_collector_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/bit_collector_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -106,7 +106,7 @@
return new collector_validater< icl::map<int, icl::bits8, partial_absorber, std::less, inplace_bit_add, inplace_bit_and> >;
case IdentityHandlerType::partial_enricher:
return new collector_validater< icl::map<int, icl::bits32, partial_enricher, std::less, inplace_bit_add, inplace_bit_and> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case itl_map
////-----------------------------------------------------------------
@@ -116,7 +116,7 @@
return new collector_validater<interval_map<int, icl::bits64, partial_absorber, std::less, inplace_bit_add, inplace_bit_and> >;
case IdentityHandlerType::partial_enricher:
return new collector_validater<interval_map<int, icl::bits16, partial_enricher, std::less, inplace_bit_add, inplace_bit_and> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
////-----------------------------------------------------------------
@@ -126,12 +126,12 @@
return new collector_validater<split_interval_map<int, icl::bits32, partial_absorber, std::less, inplace_bit_add, inplace_bit_and> >;
case IdentityHandlerType::partial_enricher:
return new collector_validater<split_interval_map<double, icl::bits8, partial_enricher, std::less, inplace_bit_add, inplace_bit_and> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/collector_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/collector_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/collector_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -106,7 +106,7 @@
case IdentityHandlerType::partial_absorber: return new collector_validater<icl::map<int,std::set<int> > >;
case IdentityHandlerType::partial_enricher: return new collector_validater<icl::map<int,std::set<int>,partial_enricher> >;
//case IdentityHandlerType::total_absorber : return new collector_validater<icl::map<int,std::set<int>,total_absorber > >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case itl_map
//-----------------------------------------------------------------
@@ -115,7 +115,7 @@
case IdentityHandlerType::partial_absorber: return new collector_validater<interval_map<double,std::set<int> > >;
case IdentityHandlerType::partial_enricher: return new collector_validater<interval_map<int,std::set<int>,partial_enricher> >;
//case IdentityHandlerType::total_absorber : return new collector_validater<interval_map<int,std::set<int>,total_absorber > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -124,12 +124,12 @@
case IdentityHandlerType::partial_absorber: return new collector_validater<split_interval_map<int,std::set<int> > >;
case IdentityHandlerType::partial_enricher: return new collector_validater<split_interval_map<double,std::set<int>,partial_enricher> >;
//case IdentityHandlerType::total_absorber : return new collector_validater<split_interval_map<int,std::set<int>,total_absorber > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/interval_bitset_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/interval_bitset_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/interval_bitset_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -63,7 +63,7 @@
return new itl_order_validater< interval_bitset<int, bits<unsigned long> > >;
case FreeChoice::_5:
return new itl_order_validater< interval_bitset<int, bits<unsigned long long> > >;
- default: return choiceError(ITL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
+ default: return choiceError(ICL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/itl_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/itl_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_DRIVER_ITL_DRIVER_HPP_JOFA_090303
-#define BOOST_ITL_VALIDATE_DRIVER_ITL_DRIVER_HPP_JOFA_090303
+#ifndef BOOST_ICL_VALIDATE_DRIVER_ICL_DRIVER_HPP_JOFA_090303
+#define BOOST_ICL_VALIDATE_DRIVER_ICL_DRIVER_HPP_JOFA_090303
#include <iostream>
#include <stdio.h>
@@ -128,7 +128,7 @@
// The least count of validation cycles performed on a single law instance.
int min_test_count = 9999;
- ITL_const_FORALL(ValidationCounterT, it, _frequencies)
+ ICL_const_FORALL(ValidationCounterT, it, _frequencies)
min_test_count = min_test_count < it->second.count() ?
min_test_count : it->second.count() ;
@@ -142,7 +142,7 @@
int valid_count = 1;
double avg_evaluation_time = 0.0;
long instance_count = 0;
- ITL_FORALL(ValidationCounterT, it, _frequencies)
+ ICL_FORALL(ValidationCounterT, it, _frequencies)
{
long law_validation_count = it->second.count();
double avg_law_evaluation_time =
@@ -167,14 +167,14 @@
std::cout << "------------------------------------------------------------------------------" << std::endl;
std::cout << "--- Law violations -----------------------------------------------count-------" << std::endl;
}
- ITL_FORALL(ViolationMapT, it, _violations)
+ ICL_FORALL(ViolationMapT, it, _violations)
{
printf("%3d %-59s%8d\n", violation_count, it->first.c_str(), it->second.getViolationsCount());
violation_count++;
}
if(!icl::is_empty(_violations))
std::cout << "------------------------------------------------------------------------------" << std::endl;
- ITL_FORALL(ViolationMapT, it, _violations)
+ ICL_FORALL(ViolationMapT, it, _violations)
{
PolyLawViolations violas = it->second;
violas.reportFirst();
@@ -187,7 +187,7 @@
{
FILE* fp = fopen(filename.c_str(), "w");
int valid_count = 1;
- ITL_FORALL(ValidationCounterT, it, _frequencies)
+ ICL_FORALL(ValidationCounterT, it, _frequencies)
{
fprintf(fp, "%3d %-66s\n", valid_count, it->first.c_str());
valid_count++;
@@ -307,6 +307,6 @@
#pragma warning(pop)
#endif
-#endif // BOOST_ITL_VALIDATE_DRIVER_ITL_DRIVER_HPP_JOFA_090303
+#endif // BOOST_ICL_VALIDATE_DRIVER_ICL_DRIVER_HPP_JOFA_090303
Modified: sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/itl_morphic_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -111,10 +111,10 @@
case DomainType::Int:
switch(identityHandlerChoice) {
NEURONIZER_CASES(interval_morphic_validater, split_interval_map, int, int)
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
identityHandlerChoice, _identityHandlerChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -123,12 +123,12 @@
case DomainType::Int:
switch(identityHandlerChoice) {
NEURONIZER_CASES(interval_morphic_validater, interval_map, int, int)
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch(rootChoice)
}
Modified: sandbox/itl/boost/validate/driver/itl_relations_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_relations_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/itl_relations_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -103,21 +103,21 @@
case RootType::interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
case RootType::separate_interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<separate_interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
case RootType::split_interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<split_interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -133,10 +133,10 @@
return new itl_induced_relations_validater<split_interval_map<int,int,total_absorber> >;
case IdentityHandlerType::total_enricher:
return new itl_induced_relations_validater<split_interval_map<int,int,total_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
identityHandlerChoice, _identityHandlerChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -152,14 +152,14 @@
return new itl_induced_relations_validater<interval_map<int,int,total_absorber> >;
case IdentityHandlerType::total_enricher:
return new itl_induced_relations_validater<interval_map<int,int,total_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
identityHandlerChoice, _identityHandlerChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/itl_set_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_set_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/itl_set_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_VALIDATE_DRIVER_ITL_SET_DRIVER_HPP_JOFA_080405
-#define BOOST_VALIDATE_DRIVER_ITL_SET_DRIVER_HPP_JOFA_080405
+#ifndef BOOST_VALIDATE_DRIVER_ICL_SET_DRIVER_HPP_JOFA_080405
+#define BOOST_VALIDATE_DRIVER_ICL_SET_DRIVER_HPP_JOFA_080405
#include <iostream>
#include <stdio.h>
@@ -70,7 +70,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_set_validater<std::set<int> >;
case DomainType::Double: return new itl_set_validater<std::set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -78,7 +78,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_set_validater<interval_set<int> >;
case DomainType::Double: return new itl_set_validater<interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -86,7 +86,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_set_validater<separate_interval_set<int> >;
case DomainType::Double: return new itl_set_validater<separate_interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -94,11 +94,11 @@
switch(domainChoice) {
case DomainType::Int: return new itl_set_validater<split_interval_set<int> >;
case DomainType::Double: return new itl_set_validater<split_interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
@@ -108,4 +108,4 @@
}} // namespace icl boost
-#endif // BOOST_VALIDATE_DRIVER_ITL_SET_DRIVER_HPP_JOFA_080405
+#endif // BOOST_VALIDATE_DRIVER_ICL_SET_DRIVER_HPP_JOFA_080405
Modified: sandbox/itl/boost/validate/driver/itl_single_law_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/itl_single_law_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/itl_single_law_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -106,21 +106,21 @@
case RootType::interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
case RootType::separate_interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<separate_interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
case RootType::split_interval_set: {
switch(domainChoice) {
case DomainType::Int: return new itl_induced_relations_validater<split_interval_set<int> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -136,10 +136,10 @@
return new itl_induced_relations_validater<split_interval_map<int,int,total_absorber> >;
case IdentityHandlerType::total_enricher:
return new itl_induced_relations_validater<split_interval_map<int,int,total_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
identityHandlerChoice, _identityHandlerChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -155,14 +155,14 @@
return new itl_induced_relations_validater<interval_map<int,int,total_absorber> >;
case IdentityHandlerType::total_enricher:
return new itl_induced_relations_validater<interval_map<int,int,total_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"),
identityHandlerChoice, _identityHandlerChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/map_copy_conformity_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/map_copy_conformity_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/map_copy_conformity_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -109,7 +109,7 @@
case IdentityHandlerType::partial_enricher: return new function_equality_validater<icl::list<std::pair<int,int> >, icl::map<int,int,partial_enricher> >;
case IdentityHandlerType::total_absorber: return new function_equality_validater<icl::list<std::pair<int,int> >, icl::map<int,int,total_absorber > >;
case IdentityHandlerType::total_enricher: return new function_equality_validater<icl::list<std::pair<int,int> >, icl::map<int,int,total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case itl_map
//-----------------------------------------------------------------
@@ -119,7 +119,7 @@
case IdentityHandlerType::partial_enricher: return new function_equality_validater<icl::list<std::pair<interval_double,int> >, interval_map<double,int,partial_enricher> >;
case IdentityHandlerType::total_absorber: return new function_equality_validater<icl::list<std::pair<interval_int, int> >, interval_map<int, int,total_absorber > >;
case IdentityHandlerType::total_enricher: return new function_equality_validater<icl::list<std::pair<interval_int, int> >, interval_map<int, int,total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -129,12 +129,12 @@
case IdentityHandlerType::partial_enricher: return new function_equality_validater<icl::list<std::pair<interval_int, int> >, split_interval_map<int, int,partial_enricher> >;
case IdentityHandlerType::total_absorber: return new function_equality_validater<icl::list<std::pair<interval_double,int> >, split_interval_map<double,int,total_absorber > >;
case IdentityHandlerType::total_enricher: return new function_equality_validater<icl::list<std::pair<interval_int, int> >, split_interval_map<int, int,total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/map_order_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/map_order_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/map_order_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -106,7 +106,7 @@
case CodomainType::Nat: return new itl_order_validater<icl::map<int,nat,total_enricher> >;
case CodomainType::Int: return new itl_order_validater<icl::map<int,int,partial_absorber> >;
case CodomainType::set_int: return new itl_order_validater<icl::map<int,std::set<int>,partial_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}//switch codomain
@@ -115,11 +115,11 @@
case CodomainType::Nat: return new itl_order_validater<icl::map<double,nat,partial_enricher> >;
case CodomainType::Int: return new itl_order_validater<icl::map<double,int,total_absorber> >;
case CodomainType::set_int: return new itl_order_validater<icl::map<double,std::set<int>,partial_absorber> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}//switch codomain
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: domainChoice:\n"),
domainChoice, _domainChoice);
}//switch domain
}//case itl_map
@@ -131,7 +131,7 @@
case CodomainType::Nat: return new itl_order_validater<interval_map<int,nat,partial_absorber> >;
case CodomainType::Int: return new itl_order_validater<interval_map<int,int,total_enricher> >;
case CodomainType::set_int: return new itl_order_validater<interval_map<int,std::set<int>,total_absorber> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}// switch codomain
case DomainType::Double:
@@ -139,10 +139,10 @@
case CodomainType::Nat: return new itl_order_validater<interval_map<double,nat,total_absorber> >;
case CodomainType::Int: return new itl_order_validater<interval_map<double,int,partial_enricher> >;
case CodomainType::set_int: return new itl_order_validater<interval_map<double,std::set<int>,total_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}// switch codomain
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}//switch domain
}//case interval_map
@@ -154,7 +154,7 @@
case CodomainType::Nat: return new itl_order_validater<split_interval_map<int,nat,total_enricher> >;
case CodomainType::Int: return new itl_order_validater<split_interval_map<int,int,partial_absorber> >;
case CodomainType::set_int: return new itl_order_validater<split_interval_map<int,std::set<int>,partial_enricher> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}
case DomainType::Double:
@@ -162,16 +162,16 @@
case CodomainType::Nat: return new itl_order_validater<split_interval_map<double,nat,partial_enricher> >;
case CodomainType::Int: return new itl_order_validater<split_interval_map<double,int,total_absorber> >;
case CodomainType::set_int: return new itl_order_validater<split_interval_map<double,std::set<int>,partial_absorber> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: codomainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: codomainChoice:\n"),
codomainChoice, _codomainChoice);
}
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: domainChoice:\n"),
domainChoice, _domainChoice);
}//switch domain
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/set_copy_conformity_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/set_copy_conformity_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/set_copy_conformity_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -101,11 +101,11 @@
{
//-----------------------------------------------------------------
case RootType::itl_set: return new function_equality_validater<icl::list<int>, icl::set<int> >;
- case RootType::interval_set: return new function_equality_validater<icl::list<ITL_INTERVAL_DEFAULT<int> >, interval_set<int> >;
- case RootType::separate_interval_set: return new function_equality_validater<icl::list<ITL_INTERVAL_DEFAULT<int> >, separate_interval_set<int> >;
- case RootType::split_interval_set: return new function_equality_validater<icl::list<ITL_INTERVAL_DEFAULT<int> >, split_interval_set<int> >;
+ case RootType::interval_set: return new function_equality_validater<icl::list<ICL_INTERVAL_DEFAULT<int> >, interval_set<int> >;
+ case RootType::separate_interval_set: return new function_equality_validater<icl::list<ICL_INTERVAL_DEFAULT<int> >, separate_interval_set<int> >;
+ case RootType::split_interval_set: return new function_equality_validater<icl::list<ICL_INTERVAL_DEFAULT<int> >, split_interval_set<int> >;
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/set_order_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/set_order_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/set_order_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -102,7 +102,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_order_validater<std::set<int> >;
case DomainType::Double: return new itl_order_validater<std::set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -110,7 +110,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_order_validater<interval_set<int> >;
case DomainType::Double: return new itl_order_validater<interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -118,7 +118,7 @@
switch(domainChoice) {
case DomainType::Int: return new itl_order_validater<separate_interval_set<int> >;
case DomainType::Double: return new itl_order_validater<separate_interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::separate_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
@@ -126,11 +126,11 @@
switch(domainChoice) {
case DomainType::Int: return new itl_order_validater<split_interval_set<int> >;
case DomainType::Double: return new itl_order_validater<split_interval_set<double> >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_set: domainChoice:\n"),
domainChoice, _domainChoice);
}
}
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/signed_quantifier_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/signed_quantifier_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/signed_quantifier_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -108,7 +108,7 @@
case IdentityHandlerType::partial_enricher: return new signed_quantifier_validater<icl::map<int, double, partial_enricher> >;
case IdentityHandlerType::total_absorber: return new signed_quantifier_validater<icl::map<double, int, total_absorber > >;
case IdentityHandlerType::total_enricher: return new signed_quantifier_validater<icl::map<double, double, total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case itl_map
//-----------------------------------------------------------------
@@ -118,7 +118,7 @@
case IdentityHandlerType::partial_enricher: return new signed_quantifier_validater<interval_map<double, int, partial_enricher> >;
case IdentityHandlerType::total_absorber: return new signed_quantifier_validater<interval_map<int, double, total_absorber > >;
case IdentityHandlerType::total_enricher: return new signed_quantifier_validater<interval_map<int, int, total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -128,12 +128,12 @@
case IdentityHandlerType::partial_enricher: return new signed_quantifier_validater<split_interval_map<int, double, partial_enricher> >;
case IdentityHandlerType::total_absorber: return new signed_quantifier_validater<split_interval_map<double, int, total_absorber > >;
case IdentityHandlerType::total_enricher: return new signed_quantifier_validater<split_interval_map<int, double, total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_bitset_back_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_bitset_back_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_bitset_back_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -58,7 +58,7 @@
return new sorted_associative_back_validater< interval_bitset<int, bits<unsigned long> >, icl::list<int> >;
case FreeChoice::_4:
return new sorted_associative_back_validater< interval_bitset<int, bits<unsigned long long> >, icl::list<int> >;
- default: return choiceError(ITL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
+ default: return choiceError(ICL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_bitset_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_bitset_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_bitset_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -58,7 +58,7 @@
return new sorted_associative_validater< interval_bitset<int, bits<unsigned long> >, icl::list<int> >;
case FreeChoice::_4:
return new sorted_associative_validater< interval_bitset<int, bits<unsigned long long> >, icl::list<int> >;
- default: return choiceError(ITL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
+ default: return choiceError(ICL_LOCATION("freeChoice:\n"), freeChoice, _freeChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_map_back_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_map_back_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_map_back_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -107,7 +107,7 @@
case IdentityHandlerType::partial_enricher: return new sorted_associative_back_validater<interval_map<int,int,partial_enricher>, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_absorber: return new sorted_associative_back_validater<interval_map<int,int,total_absorber >, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_enricher: return new sorted_associative_back_validater<interval_map<int,int,total_enricher >, icl::list<std::pair<int,int> > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -117,12 +117,12 @@
case IdentityHandlerType::partial_enricher: return new sorted_associative_back_validater<split_interval_map<int,int,partial_enricher>, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_absorber: return new sorted_associative_back_validater<split_interval_map<int,int,total_absorber >, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_enricher: return new sorted_associative_back_validater<split_interval_map<int,int,total_enricher >, icl::list<std::pair<int,int> > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_map_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_map_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_map_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -107,7 +107,7 @@
case IdentityHandlerType::partial_enricher: return new sorted_associative_validater<interval_map<int,int,partial_enricher>, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_absorber: return new sorted_associative_validater<interval_map<int,int,total_absorber >, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_enricher: return new sorted_associative_validater<interval_map<int,int,total_enricher >, icl::list<std::pair<int,int> > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -117,12 +117,12 @@
case IdentityHandlerType::partial_enricher: return new sorted_associative_validater<split_interval_map<int,int,partial_enricher>, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_absorber: return new sorted_associative_validater<split_interval_map<int,int,total_absorber >, icl::list<std::pair<int,int> > >;
case IdentityHandlerType::total_enricher: return new sorted_associative_validater<split_interval_map<int,int,total_enricher >, icl::list<std::pair<int,int> > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_set_back_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_set_back_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_set_back_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -102,7 +102,7 @@
case RootType:: interval_set: return new sorted_associative_back_validater< interval_set<int>, icl::list<int> >;
case RootType::separate_interval_set: return new sorted_associative_back_validater<separate_interval_set<int>, icl::list<int> >;
case RootType:: split_interval_set: return new sorted_associative_back_validater< split_interval_set<int>, icl::list<int> >;
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/sorted_associative_set_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/sorted_associative_set_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/sorted_associative_set_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -103,7 +103,7 @@
case RootType:: interval_set: return new sorted_associative_validater< interval_set<int>, icl::list<int> >;
case RootType::separate_interval_set: return new sorted_associative_validater<separate_interval_set<int>, icl::list<int> >;
case RootType:: split_interval_set: return new sorted_associative_validater< split_interval_set<int>, icl::list<int> >;
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/driver/unsigned_quantifier_driver.hpp
==============================================================================
--- sandbox/itl/boost/validate/driver/unsigned_quantifier_driver.hpp (original)
+++ sandbox/itl/boost/validate/driver/unsigned_quantifier_driver.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -107,7 +107,7 @@
case IdentityHandlerType::partial_enricher: return new unsigned_quantifier_validater<icl::map<double,nat, partial_enricher> >;
case IdentityHandlerType::total_absorber: return new unsigned_quantifier_validater<icl::map<int, double,total_absorber > >;
case IdentityHandlerType::total_enricher: return new unsigned_quantifier_validater<icl::map<int, nat, total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::itl_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case itl_map
//-----------------------------------------------------------------
@@ -117,7 +117,7 @@
case IdentityHandlerType::partial_enricher: return new unsigned_quantifier_validater<interval_map<int, double,partial_enricher> >;
case IdentityHandlerType::total_absorber: return new unsigned_quantifier_validater<interval_map<double,nat, total_absorber > >;
case IdentityHandlerType::total_enricher: return new unsigned_quantifier_validater<interval_map<double,double,total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case interval_map
//-----------------------------------------------------------------
@@ -127,12 +127,12 @@
case IdentityHandlerType::partial_enricher: return new unsigned_quantifier_validater<split_interval_map<double,nat, partial_enricher> >;
case IdentityHandlerType::total_absorber: return new unsigned_quantifier_validater<split_interval_map<int, double,total_absorber > >;
case IdentityHandlerType::total_enricher: return new unsigned_quantifier_validater<split_interval_map<double,double,total_enricher > >;
- default: return choiceError(ITL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
+ default: return choiceError(ICL_LOCATION("\nRootType::split_interval_map: identityHandlerChoice:\n"), identityHandlerChoice, _identityHandlerChoice);
}//switch identityHandlerChoice
}//case split_interval_map
//-----------------------------------------------------------------
- default: return choiceError(ITL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
+ default: return choiceError(ICL_LOCATION("rootChoice:\n"), rootChoice, _rootChoice);
} //switch()
}
Modified: sandbox/itl/boost/validate/gentor/randomgentor.hpp
==============================================================================
--- sandbox/itl/boost/validate/gentor/randomgentor.hpp (original)
+++ sandbox/itl/boost/validate/gentor/randomgentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -33,7 +33,7 @@
#include <boost/itl/interval_map.hpp>
#include <boost/itl/split_interval_map.hpp>
#include <boost/itl_xt/interval_bitset.hpp>
-#ifdef USE_ITL_TREE
+#ifdef USE_ICL_TREE
#include <boost/itl/tree/tree.hpp>
#endif
#include <boost/validate/gentor/gentorprofile.hpp>
@@ -54,11 +54,11 @@
public bits_gentor<icl::bits<NaturalT> > {};
// -------------------------------------------------------------------------
- template <class DomainT, ITL_COMPARE Compare>
+ template <class DomainT, ICL_COMPARE Compare>
class RandomGentor<continuous_interval<DomainT,Compare> > :
public ItvGentorT<DomainT, continuous_interval<DomainT,Compare> > {};
- template <class DomainT, ITL_COMPARE Compare>
+ template <class DomainT, ICL_COMPARE Compare>
class RandomGentor<discrete_interval<DomainT,Compare> > :
public ItvGentorT<DomainT, discrete_interval<DomainT,Compare> > {};
@@ -84,19 +84,19 @@
#endif //LAW_BASED_TEST_BOOST_POLYGON
// ----- lists -------------------------------------------------------------
- template <class DomainT, class CodomainT, ITL_COMPARE Compare>
+ template <class DomainT, class CodomainT, ICL_COMPARE Compare>
class RandomGentor<std::pair<discrete_interval<DomainT,Compare>, CodomainT> > :
public map_segment_gentor<DomainT,CodomainT,discrete_interval<DomainT,Compare> > {};
- template <class DomainT, class CodomainT, ITL_COMPARE Compare>
+ template <class DomainT, class CodomainT, ICL_COMPARE Compare>
class RandomGentor<std::pair<continuous_interval<DomainT,Compare>, CodomainT> > :
public map_segment_gentor<DomainT,CodomainT,continuous_interval<DomainT,Compare> > {};
- template <class DomainT, class CodomainT, ITL_COMPARE Compare>
+ template <class DomainT, class CodomainT, ICL_COMPARE Compare>
class RandomGentor<icl::list<std::pair<discrete_interval<DomainT,Compare>, CodomainT> > > :
public SeqGentorT<icl::list<std::pair<discrete_interval<DomainT,Compare>, CodomainT> > > {};
- template <class DomainT, class CodomainT, ITL_COMPARE Compare>
+ template <class DomainT, class CodomainT, ICL_COMPARE Compare>
class RandomGentor<icl::list<std::pair<continuous_interval<DomainT,Compare>, CodomainT> > > :
public SeqGentorT<icl::list<std::pair<continuous_interval<DomainT,Compare>, CodomainT> > > {};
@@ -104,11 +104,11 @@
class RandomGentor<icl::list<std::pair<DomainT,CodomainT> > > :
public SeqGentorT<icl::list<std::pair<DomainT,CodomainT> > > {};
- template <class DomainT, ITL_COMPARE Compare>
+ template <class DomainT, ICL_COMPARE Compare>
class RandomGentor<icl::list<discrete_interval<DomainT,Compare> > > :
public SeqGentorT<icl::list<discrete_interval<DomainT,Compare> > > {};
- template <class DomainT, ITL_COMPARE Compare>
+ template <class DomainT, ICL_COMPARE Compare>
class RandomGentor<icl::list<continuous_interval<DomainT,Compare> > > :
public SeqGentorT<icl::list<continuous_interval<DomainT,Compare> > > {};
@@ -134,7 +134,7 @@
public SetGentorT<icl::split_interval_set<DomainT> > {};
// ----- tree --------------------------------------------------------------
-#ifdef USE_ITL_TREE
+#ifdef USE_ICL_TREE
template <class DomainT>
class RandomGentor<icl::tree<DomainT> > :
public SetGentorT<icl::tree<DomainT> > {};
@@ -150,7 +150,7 @@
public MapGentorT<icl::map<DomainT,std::set<int>,Neutronizer> > {};
template <class DomainT, class BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section>
class RandomGentor<icl::map<DomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > :
public MapGentorT<icl::map<DomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > {};
@@ -188,12 +188,12 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
template <class NumericDomainT, class BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section>
class RandomGentor<split_interval_map<NumericDomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > :
public MapGentorT<split_interval_map<NumericDomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > {};
template <class NumericDomainT, class BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section>
class RandomGentor<interval_map<NumericDomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > :
public MapGentorT<interval_map<NumericDomainT,icl::bits<BitsT>,Neutronizer,Compare,Combine,Section> > {};
@@ -281,7 +281,7 @@
};
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
struct Calibrater<discrete_interval<int,Compare>, RandomGentor>
{
static void apply(RandomGentor<discrete_interval<int,Compare> >& gentor)
@@ -361,19 +361,19 @@
}
};
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
struct Calibrater<std::pair<discrete_interval<int,Compare>, int>, RandomGentor>
{
static void apply(RandomGentor< std::pair<discrete_interval<int,Compare>, int> >&){}
};
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
struct Calibrater<std::pair<continuous_interval<double,Compare>, int>, RandomGentor>
{
static void apply(RandomGentor< std::pair<continuous_interval<double,Compare>, int> >&){}
};
- template <ITL_INTERVAL(ITL_COMPARE) Interval>
+ template <ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<icl::list<std::pair<Interval, int> >, RandomGentor>
{
static void apply(RandomGentor< icl::list<std::pair<Interval, int> > >& gentor)
@@ -391,7 +391,7 @@
}
};
- template <class NumericT, ITL_COMPARE Compare>
+ template <class NumericT, ICL_COMPARE Compare>
struct Calibrater<icl::list< continuous_interval<NumericT,Compare> >, RandomGentor>
{
static void apply(RandomGentor< icl::list< continuous_interval<NumericT,Compare> > >& gentor)
@@ -405,7 +405,7 @@
}
};
- template <class NumericT, ITL_COMPARE Compare>
+ template <class NumericT, ICL_COMPARE Compare>
struct Calibrater<icl::list< discrete_interval<NumericT,Compare> >, RandomGentor>
{
static void apply(RandomGentor< icl::list< discrete_interval<NumericT,Compare> > >& gentor)
@@ -419,7 +419,7 @@
}
};
- template <class NumericT, ITL_COMPARE Compare>
+ template <class NumericT, ICL_COMPARE Compare>
struct Calibrater<icl::list< right_open_interval<NumericT,Compare> >, RandomGentor>
{
static void apply(RandomGentor< icl::list< right_open_interval<NumericT,Compare> > >& gentor)
@@ -462,7 +462,7 @@
}
};
- template <ITL_COMPARE Compare>
+ template <ICL_COMPARE Compare>
struct Calibrater<icl::list<std::pair<discrete_interval<int,Compare>, int> >, RandomGentor>
{
static void apply(RandomGentor< icl::list<std::pair<discrete_interval<int,Compare>, int> > >& gentor)
@@ -535,42 +535,42 @@
//----------------------------------------------------------------------------
// icl::{,separate,split}_interval_set<NumericDomainT>
//----------------------------------------------------------------------------
- template <class NumericDomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
+ template <class NumericDomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_set<NumericDomainT,Compare,Interval>, RandomGentor>
{
static void apply(RandomGentor<interval_set<NumericDomainT,Compare,Interval> >& gentor)
{
gentor.setRangeOfSampleSize(GentorProfileSgl::it()->range_ContainerSize());
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
domainGentor->setRange(GentorProfileSgl_numeric_range<NumericDomainT>::get());
domainGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
gentor.setDomainGentor(domainGentor);
}
};
- template <class NumericDomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
+ template <class NumericDomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<separate_interval_set<NumericDomainT,Compare,Interval>, RandomGentor>
{
static void apply(RandomGentor<separate_interval_set<NumericDomainT,Compare,Interval> >& gentor)
{
gentor.setRangeOfSampleSize(GentorProfileSgl::it()->range_ContainerSize());
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
domainGentor->setRange(GentorProfileSgl_numeric_range<NumericDomainT>::get());
domainGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
gentor.setDomainGentor(domainGentor);
}
};
- template <class NumericDomainT, ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
+ template <class NumericDomainT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<split_interval_set<NumericDomainT,Compare,Interval>, RandomGentor>
{
static void apply(RandomGentor<split_interval_set<NumericDomainT,Compare,Interval> >& gentor)
{
gentor.setRangeOfSampleSize(GentorProfileSgl::it()->range_ContainerSize());
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* domainGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
domainGentor->setRange(GentorProfileSgl_numeric_range<NumericDomainT>::get());
domainGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
gentor.setDomainGentor(domainGentor);
@@ -580,7 +580,7 @@
//--------------------------------------------------------------------------
// icl::tree
//--------------------------------------------------------------------------
-#ifdef USE_ITL_TREE
+#ifdef USE_ICL_TREE
template <>
struct Calibrater<icl::tree<int>, RandomGentor>
{
@@ -669,7 +669,7 @@
};
template <typename NumericDomainT, typename BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section>
struct Calibrater<icl::map<NumericDomainT,icl::bits<BitsT>,Neutronizer,
Compare,Combine,Section>, RandomGentor>
{
@@ -693,8 +693,8 @@
// icl::interval_map<DomainT,CodomainT,Neutronizer>
//----------------------------------------------------------------------------
template <class NumericDomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_map<NumericDomainT,icl::set<int>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -706,8 +706,8 @@
// Set the range within which the sizes of the generated object varies.
gentor.setRangeOfSampleSize(GentorProfileSgl::it()->range_ContainerSize());
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -725,8 +725,8 @@
};
template <class NumericDomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_map<NumericDomainT,std::set<int>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -738,8 +738,8 @@
// Set the range within which the sizes of the generated object varies.
gentor.setRangeOfSampleSize(GentorProfileSgl::it()->range_ContainerSize());
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -757,8 +757,8 @@
};
template <typename NumericDomainT, typename NumericCodomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_map<NumericDomainT,NumericCodomainT,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -772,8 +772,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -790,8 +790,8 @@
// icl::split_interval_map<DomainT,CodomainT,Neutronizer>
//----------------------------------------------------------------------------
template <class NumericDomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<split_interval_map<NumericDomainT,icl::set<int>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -804,8 +804,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -823,8 +823,8 @@
};
template <class NumericDomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<split_interval_map<NumericDomainT,std::set<int>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -837,8 +837,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -856,8 +856,8 @@
};
template <typename NumericDomainT, typename NumericCodomainT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<split_interval_map<NumericDomainT,NumericCodomainT,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -871,8 +871,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -887,8 +887,8 @@
template <typename NumericDomainT, typename BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_map<NumericDomainT,icl::bits<BitsT>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -901,8 +901,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -917,8 +917,8 @@
template <typename NumericDomainT, typename BitsT, class Neutronizer,
- ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section,
- ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_COMBINE Combine, ICL_SECTION Section,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<split_interval_map<NumericDomainT,icl::bits<BitsT>,
Neutronizer,Compare,Combine,Section,
Interval >, RandomGentor>
@@ -931,8 +931,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
@@ -947,7 +947,7 @@
// ---------------------------------------------------------------------------
template <typename NumericDomainT, typename BitsT,
- ITL_COMPARE Compare, ITL_INTERVAL(ITL_COMPARE) Interval>
+ ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval>
struct Calibrater<interval_bitset<NumericDomainT,icl::bits<BitsT>,
Compare, Interval >, RandomGentor>
{
@@ -958,8 +958,8 @@
// If it is a container: (Create and) Pass the generator(s) for their contents
// NumberGentorT<int> intGentor;
- ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
- = new ItvGentorT<NumericDomainT, ITL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
+ ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >* itvGentor
+ = new ItvGentorT<NumericDomainT, ICL_INTERVAL_TYPE(Interval,NumericDomainT,Compare) >;
typename icl::interval<NumericDomainT>::type valRange = GentorProfileSgl_numeric_range<NumericDomainT>::get();
itvGentor->setValueRange(valRange.lower(), valRange.upper());
itvGentor->setMaxIntervalLength(GentorProfileSgl::it()->maxIntervalLength());
Modified: sandbox/itl/boost/validate/itl/functors.hpp
==============================================================================
--- sandbox/itl/boost/validate/itl/functors.hpp (original)
+++ sandbox/itl/boost/validate/itl/functors.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -13,8 +13,8 @@
handcoded loops and calls of std::algorithms.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_VALIDATE_ITL_FUNCTORS_HPP_JOFA_091004
-#define BOOST_VALIDATE_ITL_FUNCTORS_HPP_JOFA_091004
+#ifndef BOOST_VALIDATE_ICL_FUNCTORS_HPP_JOFA_091004
+#define BOOST_VALIDATE_ICL_FUNCTORS_HPP_JOFA_091004
#include <boost/itl/iterator.hpp>
@@ -27,7 +27,7 @@
void operator()(TargetT& collected, const SourceT& items)
{
icl::clear(collected);
- ITL_const_FORALL(typename SourceT, item_, items)
+ ICL_const_FORALL(typename SourceT, item_, items)
collected.insert(*item_);
}
};
@@ -43,7 +43,7 @@
typedef typename TargetT::value_type target_value_type;
icl::clear(collected);
typename TargetT::iterator prior_ = collected.end();
- ITL_const_FORALL(typename SourceT, item_, items)
+ ICL_const_FORALL(typename SourceT, item_, items)
prior_ = collected.insert(prior_, *item_);
}
};
@@ -71,7 +71,7 @@
void operator()(TargetT& collected, const SourceT& items)
{
icl::clear(collected);
- ITL_const_FORALL(typename SourceT, item_, items)
+ ICL_const_FORALL(typename SourceT, item_, items)
//JODO icl::add(collected, *item_);
collected.add(*item_);
}
@@ -87,7 +87,7 @@
{
icl::clear(collected);
typename TargetT::iterator prior_ = collected.end();
- ITL_const_FORALL(typename SourceT, item_, items)
+ ICL_const_FORALL(typename SourceT, item_, items)
//JODO prior_ = add(collected, prior_, *item_);
prior_ = collected.add(prior_, *item_);
}
Modified: sandbox/itl/boost/validate/laws/algo_equivalence.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/algo_equivalence.hpp (original)
+++ sandbox/itl/boost/validate/laws/algo_equivalence.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_090821
-#define BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_090821
+#ifndef BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_090821
+#define BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_090821
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/functors.hpp>
@@ -209,5 +209,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_070411
+#endif // BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_070411
Modified: sandbox/itl/boost/validate/laws/element_order.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/element_order.hpp (original)
+++ sandbox/itl/boost/validate/laws/element_order.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_ELEMENT_ORDER_HPP_JOFA_090202
-#define BOOST_ITL_ELEMENT_ORDER_HPP_JOFA_090202
+#ifndef BOOST_ICL_ELEMENT_ORDER_HPP_JOFA_090202
+#define BOOST_ICL_ELEMENT_ORDER_HPP_JOFA_090202
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/detail/interval_morphism.hpp>
@@ -215,5 +215,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_ELEMENT_ORDER_HPP_JOFA_090202
+#endif // BOOST_ICL_ELEMENT_ORDER_HPP_JOFA_090202
Modified: sandbox/itl/boost/validate/laws/function_equality.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/function_equality.hpp (original)
+++ sandbox/itl/boost/validate/laws/function_equality.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FUNCTION_EQUALITY_HPP_JOFA_091005
-#define BOOST_ITL_FUNCTION_EQUALITY_HPP_JOFA_091005
+#ifndef BOOST_ICL_FUNCTION_EQUALITY_HPP_JOFA_091005
+#define BOOST_ICL_FUNCTION_EQUALITY_HPP_JOFA_091005
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/functors.hpp>
@@ -102,5 +102,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_FUNCTION_EQUALITY_HPP_JOFA_091005
+#endif // BOOST_ICL_FUNCTION_EQUALITY_HPP_JOFA_091005
Modified: sandbox/itl/boost/validate/laws/induced_relation.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/induced_relation.hpp (original)
+++ sandbox/itl/boost/validate/laws/induced_relation.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INDUCED_RELATION_HPP_JOFA_090204
-#define BOOST_ITL_INDUCED_RELATION_HPP_JOFA_090204
+#ifndef BOOST_ICL_INDUCED_RELATION_HPP_JOFA_090204
+#define BOOST_ICL_INDUCED_RELATION_HPP_JOFA_090204
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -107,5 +107,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_INDUCED_RELATION_HPP_JOFA_090204
+#endif // BOOST_ICL_INDUCED_RELATION_HPP_JOFA_090204
Modified: sandbox/itl/boost/validate/laws/inversion_laws.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/inversion_laws.hpp (original)
+++ sandbox/itl/boost/validate/laws/inversion_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_INVERSION_LAWS_HPP_JOFA_071124
-#define BOOST_ITL_INVERSION_LAWS_HPP_JOFA_071124
+#ifndef BOOST_ICL_INVERSION_LAWS_HPP_JOFA_071124
+#define BOOST_ICL_INVERSION_LAWS_HPP_JOFA_071124
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -308,6 +308,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_INVERSION_LAWS_HPP_JOFA_071124
+#endif // BOOST_ICL_INVERSION_LAWS_HPP_JOFA_071124
Modified: sandbox/itl/boost/validate/laws/law.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/law.hpp (original)
+++ sandbox/itl/boost/validate/laws/law.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_LAW_HPP_JOFA_070411
-#define BOOST_ITL_LAW_HPP_JOFA_070411
+#ifndef BOOST_ICL_LAW_HPP_JOFA_070411
+#define BOOST_ICL_LAW_HPP_JOFA_070411
#include <string>
#include <set>
@@ -136,5 +136,5 @@
#pragma warning(pop)
#endif
-#endif //BOOST_ITL_LAW_HPP_JOFA_070411
+#endif //BOOST_ICL_LAW_HPP_JOFA_070411
Modified: sandbox/itl/boost/validate/laws/law_violations.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/law_violations.hpp (original)
+++ sandbox/itl/boost/validate/laws/law_violations.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_LAW_VIOLATIONS_HPP_JOFA_070411
-#define BOOST_ITL_LAW_VIOLATIONS_HPP_JOFA_070411
+#ifndef BOOST_ICL_LAW_VIOLATIONS_HPP_JOFA_070411
+#define BOOST_ICL_LAW_VIOLATIONS_HPP_JOFA_070411
#include <string>
#include <boost/itl/set.hpp>
@@ -112,7 +112,7 @@
LawViolationsI& operator += (const LawViolationsI& rhs)
{
- ITL_const_FORALL(typename ViolationSet, vio_,
+ ICL_const_FORALL(typename ViolationSet, vio_,
dynamic_cast<const LawViolations<LawT>*>(rhs.getLawViolations())->_violations)
insert(*vio_);
@@ -147,7 +147,7 @@
const_iterator end()const { return _violations.begin(); }
void clear() { icl::clear(_violations); }
- bool empty()const { return ITL_FUN_REN(empty, is_empty, _violations); }
+ bool empty()const { return ICL_FUN_REN(empty, is_empty, _violations); }
size_type size()const { return _violations.size(); }
void reportFirst()const
@@ -181,5 +181,5 @@
}} // namespace icl boost
-#endif //BOOST_ITL_LAW_VIOLATIONS_HPP_JOFA_070411
+#endif //BOOST_ICL_LAW_VIOLATIONS_HPP_JOFA_070411
Modified: sandbox/itl/boost/validate/laws/map_laws.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/map_laws.hpp (original)
+++ sandbox/itl/boost/validate/laws/map_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MAP_LAWS_HPP_JOFA_071124
-#define BOOST_ITL_MAP_LAWS_HPP_JOFA_071124
+#ifndef BOOST_ICL_MAP_LAWS_HPP_JOFA_071124
+#define BOOST_ICL_MAP_LAWS_HPP_JOFA_071124
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -166,6 +166,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_MAP_LAWS_HPP_JOFA_071124
+#endif // BOOST_ICL_MAP_LAWS_HPP_JOFA_071124
Modified: sandbox/itl/boost/validate/laws/minor_set_laws.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/minor_set_laws.hpp (original)
+++ sandbox/itl/boost/validate/laws/minor_set_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_090821
-#define BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_090821
+#ifndef BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_090821
+#define BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_090821
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/functors.hpp>
@@ -209,5 +209,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_MINOR_SET_LAWS_HPP_JOFA_070411
+#endif // BOOST_ICL_MINOR_SET_LAWS_HPP_JOFA_070411
Modified: sandbox/itl/boost/validate/laws/monoid.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/monoid.hpp (original)
+++ sandbox/itl/boost/validate/laws/monoid.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_MONOID_HPP_JOFA_070411
-#define BOOST_ITL_MONOID_HPP_JOFA_070411
+#ifndef BOOST_ICL_MONOID_HPP_JOFA_070411
+#define BOOST_ICL_MONOID_HPP_JOFA_070411
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/functors.hpp>
@@ -341,5 +341,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_MONOID_HPP_JOFA_070411
+#endif // BOOST_ICL_MONOID_HPP_JOFA_070411
Modified: sandbox/itl/boost/validate/laws/order.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/order.hpp (original)
+++ sandbox/itl/boost/validate/laws/order.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_ORDER_HPP_JOFA_071129
-#define BOOST_ITL_ORDER_HPP_JOFA_071129
+#ifndef BOOST_ICL_ORDER_HPP_JOFA_071129
+#define BOOST_ICL_ORDER_HPP_JOFA_071129
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -224,5 +224,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_ORDER_HPP_JOFA_071129
+#endif // BOOST_ICL_ORDER_HPP_JOFA_071129
Modified: sandbox/itl/boost/validate/laws/pushouts.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/pushouts.hpp (original)
+++ sandbox/itl/boost/validate/laws/pushouts.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_PUSHOUTS_HPP_JOFA_071124
-#define BOOST_ITL_PUSHOUTS_HPP_JOFA_071124
+#ifndef BOOST_ICL_PUSHOUTS_HPP_JOFA_071124
+#define BOOST_ICL_PUSHOUTS_HPP_JOFA_071124
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -130,5 +130,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_PUSHOUTS_HPP_JOFA_071124
+#endif // BOOST_ICL_PUSHOUTS_HPP_JOFA_071124
Modified: sandbox/itl/boost/validate/laws/set_laws.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/set_laws.hpp (original)
+++ sandbox/itl/boost/validate/laws/set_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SET_LAWS_HPP_JOFA_071124
-#define BOOST_ITL_SET_LAWS_HPP_JOFA_071124
+#ifndef BOOST_ICL_SET_LAWS_HPP_JOFA_071124
+#define BOOST_ICL_SET_LAWS_HPP_JOFA_071124
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/predicates.hpp>
@@ -327,6 +327,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_SET_LAWS_HPP_JOFA_071124
+#endif // BOOST_ICL_SET_LAWS_HPP_JOFA_071124
Modified: sandbox/itl/boost/validate/laws/subset_order.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/subset_order.hpp (original)
+++ sandbox/itl/boost/validate/laws/subset_order.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SUBSET_ORDERING_HPP_JOFA_090202
-#define BOOST_ITL_SUBSET_ORDERING_HPP_JOFA_090202
+#ifndef BOOST_ICL_SUBSET_ORDERING_HPP_JOFA_090202
+#define BOOST_ICL_SUBSET_ORDERING_HPP_JOFA_090202
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/itl/detail/interval_morphism.hpp>
@@ -216,5 +216,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_SUBSET_ORDERING_HPP_JOFA_090202
+#endif // BOOST_ICL_SUBSET_ORDERING_HPP_JOFA_090202
Modified: sandbox/itl/boost/validate/laws/symmetric_difference.hpp
==============================================================================
--- sandbox/itl/boost/validate/laws/symmetric_difference.hpp (original)
+++ sandbox/itl/boost/validate/laws/symmetric_difference.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
-#define BOOST_ITL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
+#ifndef BOOST_ICL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
+#define BOOST_ICL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
#include <boost/itl/type_traits/value_size.hpp>
#include <boost/validate/laws/law.hpp>
@@ -200,6 +200,6 @@
}} // namespace icl boost
-#endif // BOOST_ITL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
+#endif // BOOST_ICL_SYMMETRIC_DIFFERENCE_HPP_JOFA_071124
Modified: sandbox/itl/boost/validate/type/bits.hpp
==============================================================================
--- sandbox/itl/boost/validate/type/bits.hpp (original)
+++ sandbox/itl/boost/validate/type/bits.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
-#define BOOST_ITL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
+#ifndef BOOST_ICL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
+#define BOOST_ICL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
#include <boost/itl/type_traits/type_to_string.hpp>
#include <boost/itl/type_traits/to_string.hpp>
@@ -83,4 +83,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
+#endif // BOOST_ICL_LIBS_VALIDATE_TEST_BITS_HPP_JOFA_091009
Modified: sandbox/itl/boost/validate/type/nat.hpp
==============================================================================
--- sandbox/itl/boost/validate/type/nat.hpp (original)
+++ sandbox/itl/boost/validate/type/nat.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -15,7 +15,7 @@
#include <boost/itl/type_traits/type_to_string.hpp>
#include <boost/itl/type_traits/value_size.hpp>
-#define ITL_LOCATION(message) location(__FILE__,__LINE__,message)
+#define ICL_LOCATION(message) location(__FILE__,__LINE__,message)
namespace boost{namespace icl
{
Modified: sandbox/itl/boost/validate/utility.hpp
==============================================================================
--- sandbox/itl/boost/validate/utility.hpp (original)
+++ sandbox/itl/boost/validate/utility.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -13,7 +13,7 @@
#include <iostream>
#include <boost/itl/type_traits/to_string.hpp>
-#define ITL_LOCATION(message) location(__FILE__,__LINE__,message)
+#define ICL_LOCATION(message) location(__FILE__,__LINE__,message)
#define NEURONIZER_CASES(validater_Template, itl_Map, domain_Type, codomain_Type) \
case IdentityHandlerType::partial_absorber: return new validater_Template<itl_Map<domain_Type,codomain_Type,partial_absorber> >; \
Modified: sandbox/itl/boost/validate/validater/abelian_monoid_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/abelian_monoid_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/abelian_monoid_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
-#define BOOST_ITL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
+#define BOOST_ICL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
#include <boost/itl/functors.hpp>
//#include <boost/validate/laws/monoid.hpp>
@@ -56,5 +56,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
+#endif // BOOST_ICL_VALIDATE_VALIDATER_ABELIAN_MONOID_VALIDATER_HPP_JOFA_100501
Modified: sandbox/itl/boost/validate/validater/collector_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/collector_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/collector_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_ITL_COLLECTOR_VALIDATER_HPP_JOFA_090315
-#define BOOST_ITL_VALIDATE_VALIDATER_ITL_COLLECTOR_VALIDATER_HPP_JOFA_090315
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_ICL_COLLECTOR_VALIDATER_HPP_JOFA_090315
+#define BOOST_ICL_VALIDATE_VALIDATER_ICL_COLLECTOR_VALIDATER_HPP_JOFA_090315
#include <boost/itl/functors.hpp>
@@ -119,5 +119,5 @@
#pragma warning(pop)
#endif
-#endif // BOOST_ITL_VALIDATE_VALIDATER_ITL_COLLECTOR_VALIDATER_HPP_JOFA_090315
+#endif // BOOST_ICL_VALIDATE_VALIDATER_ICL_COLLECTOR_VALIDATER_HPP_JOFA_090315
Modified: sandbox/itl/boost/validate/validater/concept_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/concept_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/concept_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
-#define BOOST_ITL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
+#ifndef BOOST_ICL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
+#define BOOST_ICL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
#include <boost/itl/type_traits/is_continuous.hpp>
#include <boost/itl/functors.hpp>
@@ -67,4 +67,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
+#endif // BOOST_ICL_VALIDATE_CONCEPT_VALIDATER_HPP_JOFA_080203
Modified: sandbox/itl/boost/validate/validater/itl_induced_relations.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/itl_induced_relations.hpp (original)
+++ sandbox/itl/boost/validate/validater/itl_induced_relations.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_ITL_INDUCED_RELATIONS_HPP_JOFA_090304
-#define BOOST_ITL_VALIDATE_VALIDATER_ITL_INDUCED_RELATIONS_HPP_JOFA_090304
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_ICL_INDUCED_RELATIONS_HPP_JOFA_090304
+#define BOOST_ICL_VALIDATE_VALIDATER_ICL_INDUCED_RELATIONS_HPP_JOFA_090304
#include <boost/itl/functors.hpp>
#include <boost/itl/detail/interval_morphism.hpp>
@@ -63,5 +63,5 @@
}} // namespace icl boost
-#endif BOOST_ITL_VALIDATE_VALIDATER_ITL_INDUCED_RELATIONS_HPP_JOFA_090304
+#endif BOOST_ICL_VALIDATE_VALIDATER_ICL_INDUCED_RELATIONS_HPP_JOFA_090304
Modified: sandbox/itl/boost/validate/validater/itl_set_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/itl_set_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/itl_set_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_ITL_SET_VALIDATER_HPP_JOFA_090303
-#define BOOST_ITL_VALIDATE_VALIDATER_ITL_SET_VALIDATER_HPP_JOFA_090303
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_ICL_SET_VALIDATER_HPP_JOFA_090303
+#define BOOST_ICL_VALIDATE_VALIDATER_ICL_SET_VALIDATER_HPP_JOFA_090303
#include <boost/itl/functors.hpp>
#include <boost/validate/laws/monoid.hpp>
@@ -121,4 +121,4 @@
#pragma warning(pop)
#endif
-#endif // BOOST_ITL_VALIDATE_VALIDATER_ITL_SET_VALIDATER_HPP_JOFA_090303
+#endif // BOOST_ICL_VALIDATE_VALIDATER_ICL_SET_VALIDATER_HPP_JOFA_090303
Modified: sandbox/itl/boost/validate/validater/monoid_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/monoid_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/monoid_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
-#define BOOST_ITL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
+#define BOOST_ICL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
#include <boost/itl/functors.hpp>
#include <boost/validate/validater/concept_validater.hpp>
@@ -52,5 +52,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
+#endif // BOOST_ICL_VALIDATE_VALIDATER_MONOID_VALIDATER_HPP_JOFA_100501
Modified: sandbox/itl/boost/validate/validater/signed_quantifier_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/signed_quantifier_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/signed_quantifier_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
-#define BOOST_ITL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#define BOOST_ICL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
#include <boost/itl/functors.hpp>
#include <boost/itl/type_traits/is_interval_splitter.hpp>
@@ -130,5 +130,5 @@
#pragma warning(pop)
#endif
-#endif // BOOST_ITL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#endif // BOOST_ICL_VALIDATE_VALIDATER_SIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
Modified: sandbox/itl/boost/validate/validater/unsigned_quantifier_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/unsigned_quantifier_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/unsigned_quantifier_validater.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
-#define BOOST_ITL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#ifndef BOOST_ICL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#define BOOST_ICL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
#include <boost/itl/functors.hpp>
#include <boost/itl/type_traits/absorbs_identities.hpp>
@@ -97,5 +97,5 @@
#pragma warning(pop)
#endif
-#endif // BOOST_ITL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
+#endif // BOOST_ICL_VALIDATE_VALIDATER_UNSIGNED_QUANTIFIER_VALIDATER_HPP_JOFA_090314
Modified: sandbox/itl/boost/validate/validation_counts.hpp
==============================================================================
--- sandbox/itl/boost/validate/validation_counts.hpp (original)
+++ sandbox/itl/boost/validate/validation_counts.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_VALIDATION_COUNTS_HPP_JOFA_090713
-#define BOOST_ITL_VALIDATION_COUNTS_HPP_JOFA_090713
+#ifndef BOOST_ICL_VALIDATION_COUNTS_HPP_JOFA_090713
+#define BOOST_ICL_VALIDATION_COUNTS_HPP_JOFA_090713
namespace boost{namespace icl
@@ -50,4 +50,4 @@
}} // namespace icl boost
-#endif // BOOST_ITL_VALIDATION_COUNTS_HPP_JOFA_090713
+#endif // BOOST_ICL_VALIDATION_COUNTS_HPP_JOFA_090713
Modified: sandbox/itl/libs/itl/doxy_doc/doxygen_input/pages/doxygen_mainpage.hpp
==============================================================================
--- sandbox/itl/libs/itl/doxy_doc/doxygen_input/pages/doxygen_mainpage.hpp (original)
+++ sandbox/itl/libs/itl/doxy_doc/doxygen_input/pages/doxygen_mainpage.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
-#define BOOST_ITL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
+#ifndef BOOST_ICL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
+#define BOOST_ICL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
/**
\mainpage Boost Interval Container Library
@@ -158,6 +158,6 @@
</ul>
*/
-#endif // BOOST_ITL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
+#endif // BOOST_ICL_DOXYGEN_MAINPAGE_HPP_JOFA_091216
Modified: sandbox/itl/libs/itl/example/boost_party_/boost_party.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/boost_party_/boost_party.cpp (original)
+++ sandbox/itl/libs/itl/example/boost_party_/boost_party.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -54,7 +54,7 @@
#include <boost/itl/ptime.hpp>
// Prior to other includes for interval containers we define ...
-#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
// ... so all interval containers will use right_open_intervals that
// have static interval borders.
Modified: sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp (original)
+++ sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -18,7 +18,7 @@
#include <iostream>
// Prior to other includes for interval containers we define ...
-#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
// ... so all interval containers will use right_open_intervals that
// have static interval borders.
Modified: sandbox/itl/libs/itl/example/large_bitset_/bits.hpp
==============================================================================
--- sandbox/itl/libs/itl/example/large_bitset_/bits.hpp (original)
+++ sandbox/itl/libs/itl/example/large_bitset_/bits.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_LIBS_ITL_EXAMPLE_LARGE_BITSET_BITS_HPP_JOFA_091019
-#define BOOST_LIBS_ITL_EXAMPLE_LARGE_BITSET_BITS_HPP_JOFA_091019
+#ifndef BOOST_LIBS_ICL_EXAMPLE_LARGE_BITSET_BITS_HPP_JOFA_091019
+#define BOOST_LIBS_ICL_EXAMPLE_LARGE_BITSET_BITS_HPP_JOFA_091019
//[mini_bits_includes
// These includes are needed ...
#include <string> // for conversion to output and to
Modified: sandbox/itl/libs/itl/example/large_bitset_/large_bitset.hpp
==============================================================================
--- sandbox/itl/libs/itl/example/large_bitset_/large_bitset.hpp (original)
+++ sandbox/itl/libs/itl/example/large_bitset_/large_bitset.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -6,8 +6,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_LIBS_ITL_EXAMPLE_LARGE_BITSET__LARGE_BITSET_HPP_JOFA_091019
-#define BOOST_LIBS_ITL_EXAMPLE_LARGE_BITSET__LARGE_BITSET_HPP_JOFA_091019
+#ifndef BOOST_LIBS_ICL_EXAMPLE_LARGE_BITSET__LARGE_BITSET_HPP_JOFA_091019
+#define BOOST_LIBS_ICL_EXAMPLE_LARGE_BITSET__LARGE_BITSET_HPP_JOFA_091019
//[large_bitset_includes
#include <iostream> // to organize output
@@ -39,9 +39,9 @@
<
typename DomainT = nat64,
typename BitSetT = bits64,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, DomainT),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, DomainT, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, DomainT),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, DomainT, Compare),
+ ICL_ALLOC Alloc = std::allocator
>
class large_bitset
: boost::equality_comparable < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>
@@ -59,11 +59,11 @@
, boost::andable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, DomainT
, boost::xorable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, DomainT
- , boost::addable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::orable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::subtractable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::andable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
- , boost::xorable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ITL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::addable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::orable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::subtractable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::andable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
+ , boost::xorable2 < large_bitset<DomainT,BitSetT,Compare,Interval,Alloc>, ICL_INTERVAL_TYPE(Interval,DomainT,Compare)
> > > > > > > > > > > > > > > > >
//^ & - | + ^ & - | + ^ & - | + < ==
//segment element container
Modified: sandbox/itl/libs/itl/test/fastest_interval_map_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_interval_map_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_interval_map_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
-#define BOOST_ITL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
+#ifndef BOOST_ICL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
+#define BOOST_ICL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_map_fundamentals_4_ordered_types)
@@ -80,5 +80,5 @@
{ interval_map_element_iter_4_discrete_types<discrete_type_2, int, partial_absorber, INTERVAL_MAP>();}
-#endif // BOOST_ITL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
+#endif // BOOST_ICL_FASTEST_INTERVAL_MAP_CASES_HPP_JOFA_090702
Modified: sandbox/itl/libs/itl/test/fastest_interval_map_infix_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_interval_map_infix_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_interval_map_infix_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
-#define BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#ifndef BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#define BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
BOOST_AUTO_TEST_CASE
(test_itl_interval_map_infix_plus_overload_4_bicremental_types)
@@ -28,5 +28,5 @@
(test_itl_interval_map_infix_caret_overload_4_bicremental_types)
{ interval_map_infix_caret_overload_4_bicremental_types<INTERVAL_MAP, bicremental_type_1, int>();}
-#endif // BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#endif // BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
Modified: sandbox/itl/libs/itl/test/fastest_interval_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_interval_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_interval_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
-#define BOOST_ITL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
+#ifndef BOOST_ICL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
+#define BOOST_ICL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_set_fundamentals_4_ordered_types)
@@ -60,7 +60,7 @@
(fastest_itl_interval_set_element_iter_4_discrete_types)
{ interval_set_element_iter_4_discrete_types<INTERVAL_SET, discrete_type_2>();}
-#endif // BOOST_ITL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
+#endif // BOOST_ICL_FASTEST_INTERVAL_SET_CASES_HPP_JOFA_090702
Modified: sandbox/itl/libs/itl/test/fastest_interval_set_infix_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_interval_set_infix_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_interval_set_infix_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
-#define BOOST_ITL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
+#ifndef BOOST_ICL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
+#define BOOST_ICL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_set_infix_plus_overload_4_bicremental_types)
@@ -28,7 +28,7 @@
(fastest_itl_interval_set_infix_caret_overload_4_bicremental_types)
{ interval_set_infix_caret_overload_4_bicremental_types<INTERVAL_SET, bicremental_type_5>();}
-#endif // BOOST_ITL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
+#endif // BOOST_ICL_FASTEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090702
Modified: sandbox/itl/libs/itl/test/fastest_itl_interval_/fastest_itl_interval.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_itl_interval_/fastest_itl_interval.cpp (original)
+++ sandbox/itl/libs/itl/test/fastest_itl_interval_/fastest_itl_interval.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,7 +10,7 @@
#include <boost/mpl/list.hpp>
#include "../unit_test_unwarned.hpp"
-//#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+//#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
// interval instance types
#include "../test_type_lists.hpp"
@@ -135,7 +135,7 @@
(fastest_itl_interval_touches_4_integral_types)
{ interval_touches_4_integral_types<integral_type_4>(); }
-#ifndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_ctor_specific)
@@ -159,4 +159,4 @@
(fastest_itl_interval_subtract_4_bicremental_types)
{ interval_subtract_4_bicremental_types<bicremental_type_5>(); }
-#endif // ndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#endif // ndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
Modified: sandbox/itl/libs/itl/test/fastest_itl_map_/fastest_itl_map_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_itl_map_/fastest_itl_map_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_itl_map_/fastest_itl_map_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE
(fastest_itl_itl_map_contains_4_bicremental_types)
@@ -16,4 +16,4 @@
(fastest_itl_itl_map_find_4_bicremental_types)
{ itl_map_find_4_bicremental_types<discrete_type_1, int, partial_absorber, INTERVAL_MAP>();}
-#endif // BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/fastest_set_interval_set_/fastest_set_interval_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_set_interval_set_/fastest_set_interval_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_set_interval_set_/fastest_set_interval_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
-#define BOOST_ITL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
+#ifndef BOOST_ICL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
+#define BOOST_ICL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
//------------------------------------------------------------------------------
// interval_set
@@ -79,5 +79,5 @@
-#endif // BOOST_ITL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
+#endif // BOOST_ICL_FASTEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090703
Modified: sandbox/itl/libs/itl/test/fastest_set_itl_set_/fastest_set_itl_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_set_itl_set_/fastest_set_itl_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_set_itl_set_/fastest_set_itl_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_SET_ITL_SET_CASES_HPP_JOFA_090703
-#define BOOST_ITL_FASTEST_SET_ITL_SET_CASES_HPP_JOFA_090703
+#ifndef BOOST_ICL_FASTEST_SET_ICL_SET_CASES_HPP_JOFA_090703
+#define BOOST_ICL_FASTEST_SET_ICL_SET_CASES_HPP_JOFA_090703
//------------------------------------------------------------------------------
// interval_set
@@ -30,6 +30,6 @@
(fastest_itl_itl_set_check_partial_invertive_monoid_plus_4_bicremental_types)
{ itl_set_check_partial_invertive_monoid_plus_4_bicremental_types<discrete_type_4, interval_set>();}
-#endif // BOOST_ITL_FASTEST_SET_ITL_SET_CASES_HPP_JOFA_090703
+#endif // BOOST_ICL_FASTEST_SET_ICL_SET_CASES_HPP_JOFA_090703
Modified: sandbox/itl/libs/itl/test/fastest_total_icl_quantifier_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_total_icl_quantifier_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_total_icl_quantifier_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
-#define BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#ifndef BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#define BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
//------------------------------------------------------------------------------
// total_absorber
@@ -80,5 +80,5 @@
-#endif // BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#endif // BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
Modified: sandbox/itl/libs/itl/test/fastest_total_interval_quantifier_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/fastest_total_interval_quantifier_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/fastest_total_interval_quantifier_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
-#define BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#ifndef BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#define BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
//------------------------------------------------------------------------------
// total_absorber
@@ -77,5 +77,5 @@
// partial x - x == 0 x - x =p= 0 partiality of subtraction
// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
-#endif // BOOST_ITL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
+#endif // BOOST_ICL_FASTEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090703
Modified: sandbox/itl/libs/itl/test/test_casual_/test_casual.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_casual_/test_casual.cpp (original)
+++ sandbox/itl/libs/itl/test/test_casual_/test_casual.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -21,7 +21,7 @@
#include <boost/detail/is_incrementable.hpp>
#include <boost/type_traits/is_floating_point.hpp>
-#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
#define BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT right_open_interval
#define BOOST_ICL_DISCRETE_STATIC_INTERVAL_BORDERS 2 //0=() 1=(] 2=[) 3=[]
@@ -329,7 +329,7 @@
BOOST_CHECK_EQUAL( is_interval_set<std::set<int> >::value, false );
BOOST_CHECK_EQUAL( is_interval_set<std::set<int> >::value, false );
-#if defined(ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && !defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
+#if defined(ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && !defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
BOOST_CHECK( (is_same<icl::interval<int >::type, right_open_interval<int > >::value) );
BOOST_CHECK( (is_same<icl::interval<double>::type, right_open_interval<double> >::value) );
@@ -343,7 +343,7 @@
//BOOST_CHECK_EQUAL( icl::interval<float>::left_open(1.0,2.0), icl::construct<right_open_interval<float> >(1.0,2.0) );
#endif
-#if defined(ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
+#if defined(ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
# if defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_BORDERS) && (BOOST_ICL_DISCRETE_STATIC_INTERVAL_BORDERS == 0)
cout << "discrete_interval == open_interval\n";
BOOST_CHECK( (is_same<icl::interval<int>::type, open_interval<int> >::value) );
@@ -378,7 +378,7 @@
# else
cout << "#else part, INTERVAL_BORDERS not in {0,1,2,3}\n";
-#endif //defined(ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
+#endif //defined(ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS) && defined(BOOST_ICL_DISCRETE_STATIC_INTERVAL_DEFAULT)
#else
BOOST_CHECK( (is_same<icl::interval<int >::type, discrete_interval<int > >::value) );
Modified: sandbox/itl/libs/itl/test/test_functions.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_functions.hpp (original)
+++ sandbox/itl/libs/itl/test/test_functions.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -9,8 +9,8 @@
/*-----------------------------------------------------------------------------+
Auxiliary functions to reduce redundancies in test case code.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_FUNCTIONS_H_JOFA_091003
-#define BOOST_ITL_TEST_FUNCTIONS_H_JOFA_091003
+#ifndef BOOST_ICL_TEST_FUNCTIONS_H_JOFA_091003
+#define BOOST_ICL_TEST_FUNCTIONS_H_JOFA_091003
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/type_traits/interval_type_default.hpp>
@@ -25,18 +25,18 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class SequenceT
>
void itl_map_copy(const SequenceT& segments,
IntervalMap<T,U,Trt>& destination)
{
- ITL_const_FORALL(typename SequenceT, segment_, segments)
+ ICL_const_FORALL(typename SequenceT, segment_, segments)
destination.insert(*segment_);
}
@@ -44,11 +44,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class SequenceT
>
@@ -66,5 +66,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_TEST_FUNCTIONS_H_JOFA_091003
+#endif // BOOST_ICL_TEST_FUNCTIONS_H_JOFA_091003
Modified: sandbox/itl/libs/itl/test/test_icl_continuous_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_continuous_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_continuous_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
-#define BOOST_ITL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
+#ifndef BOOST_ICL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
+#define BOOST_ICL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
template <class T, class IntervalT>
void interval_ctor_4_ordered_types()
@@ -21,7 +21,7 @@
}
-template <class T, ITL_COMPARE Compare>
+template <class T, ICL_COMPARE Compare>
void distant_intervals_4_numeric_continuous_types()
{
typedef right_open_interval<T,Compare> L__D; // L__D for [..)
@@ -49,7 +49,7 @@
test_inner_complement<T,Compare,C__I>(MK_I(C__I,0,2), MK_I(C__I,0,6));
//--------------------------------------------------------------------------
-#ifndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
test_inner_complement<T,Compare,IntervalT>(I_D(0,4), I_D(8,9));
test_inner_complement<T,Compare,IntervalT>(I_D(7,8), I_D(2,3));
test_inner_complement<T,Compare,IntervalT>(I_D(2,4), I_D(4,6));
@@ -74,9 +74,9 @@
test_inner_complement<T,Compare,IntervalT>(C_D(3,0), C_D(4,0));
test_inner_complement<T,Compare,IntervalT>(C_D(0,2), C_D(4,6));
test_inner_complement<T,Compare,IntervalT>(C_D(0,2), C_D(0,6));
-#endif //ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#endif //ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
}
-#endif // BOOST_ITL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
+#endif // BOOST_ICL_TEST_ICL_INTERVAL_CONTINUOUS_HPP_JOFA_100930
Modified: sandbox/itl/libs/itl/test/test_icl_discrete_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_discrete_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_discrete_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
template <class T, class IntervalT>
@@ -29,7 +29,7 @@
BOOST_CHECK_EQUAL( icl::contains(IntervalT(MK_v(1)), MK_v(1)), true );
}
-template <class T, ITL_COMPARE Compare>
+template <class T, ICL_COMPARE Compare>
void distant_intervals_4_discrete_types()
{
typedef right_open_interval<T,Compare> L__D; // L__D for [..)
@@ -99,4 +99,4 @@
}
-#endif // BOOST_ITL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
+#endif // BOOST_ICL_TEST_ICL_DISCRETE_INTERVAL_HPP_JOFA_100930
Modified: sandbox/itl/libs/itl/test/test_icl_dynamic_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_dynamic_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_dynamic_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
template <class IntervalT>
void dynamic_interval_ctor_4_ordered_types()
@@ -62,4 +62,4 @@
-#endif // BOOST_ITL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
+#endif // BOOST_ICL_TEST_ICL_DYNAMIC_INTERVAL_HPP_JOFA_100930
Modified: sandbox/itl/libs/itl/test/test_icl_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ICL_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_TEST_ICL_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_TEST_ICL_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_TEST_ICL_INTERVAL_HPP_JOFA_100930
// NOTE: ordered_types is the largest class of types that is admissable as
// domain parameters for intervals and interval containers.
@@ -90,4 +90,4 @@
-#endif // BOOST_ITL_TEST_ICL_INTERVAL_HPP_JOFA_100930
+#endif // BOOST_ICL_TEST_ICL_INTERVAL_HPP_JOFA_100930
Modified: sandbox/itl/libs/itl/test/test_icl_quantifier_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_quantifier_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_quantifier_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,18 +5,18 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef __TEST_ITL_QUANTIFIER_SHARED_H_JOFA_100819__
-#define __TEST_ITL_QUANTIFIER_SHARED_H_JOFA_100819__
+#ifndef __TEST_ICL_QUANTIFIER_SHARED_H_JOFA_100819__
+#define __TEST_ICL_QUANTIFIER_SHARED_H_JOFA_100819__
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void make_3_icl_maps_and_derivatives_1
@@ -69,11 +69,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_monoid_plus_4_bicremental_types()
@@ -93,11 +93,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_monoid_et_4_bicremental_types()
@@ -120,11 +120,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_abelian_monoid_plus_4_bicremental_types()
@@ -144,11 +144,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_abelian_monoid_et_4_bicremental_types()
@@ -171,11 +171,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -197,11 +197,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -227,11 +227,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_abelian_group_plus_4_bicremental_types()
@@ -253,11 +253,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
@@ -285,11 +285,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void icl_quantifier_check_containedness_4_bicremental_types()
@@ -312,5 +312,5 @@
-#endif // __TEST_ITL_QUANTIFIER_SHARED_H_JOFA_100819__
+#endif // __TEST_ICL_QUANTIFIER_SHARED_H_JOFA_100819__
Modified: sandbox/itl/libs/itl/test/test_icl_static_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_icl_static_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_icl_static_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
-#define BOOST_ITL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
+#ifndef BOOST_ICL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
+#define BOOST_ICL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
template <class T, class IntervalT>
void static_interval_ctor_4_ordered_types()
@@ -21,4 +21,4 @@
}
-#endif // BOOST_ITL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
+#endif // BOOST_ICL_TEST_ICL_STATIC_INTERVAL_HPP_JOFA_100930
Modified: sandbox/itl/libs/itl/test/test_interval_laws.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_laws.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,8 +10,8 @@
Function templates to call functions in object oriented or namespace glabal
versions.
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_LIBS_ITL_TEST_INTERVAL_LAWS_HPP_JOFA_101011
-#define BOOST_LIBS_ITL_TEST_INTERVAL_LAWS_HPP_JOFA_101011
+#ifndef BOOST_LIBS_ICL_TEST_INTERVAL_LAWS_HPP_JOFA_101011
+#define BOOST_LIBS_ICL_TEST_INTERVAL_LAWS_HPP_JOFA_101011
#include <boost/itl/detail/notate.hpp>
#include <boost/itl/detail/design_config.hpp>
@@ -81,5 +81,5 @@
}} // namespace boost icl
-#endif // BOOST_ITL_TEST_INTERVAL_LAWS_HPP_JOFA_100908
+#endif // BOOST_ICL_TEST_INTERVAL_LAWS_HPP_JOFA_100908
Modified: sandbox/itl/libs/itl/test/test_interval_map_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_interval_map_fundamentals_4_ordered_types, T, ordered_types)
@@ -79,5 +79,5 @@
(test_itl_interval_map_element_iter_4_discrete_types, T, discrete_types)
{ interval_map_element_iter_4_discrete_types<T, int, partial_absorber, INTERVAL_MAP>();}
-#endif // BOOST_ITL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_INTERVAL_MAP_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_interval_map_infix_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_infix_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map_infix_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
-#define BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#ifndef BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#define BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_map_infix_plus_overload_4_bicremental_types)
@@ -28,5 +28,5 @@
(fastest_itl_interval_map_infix_caret_overload_4_bicremental_types)
{ interval_map_infix_caret_overload_4_bicremental_types<INTERVAL_MAP, bicremental_type_5, int>();}
-#endif // BOOST_ITL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
+#endif // BOOST_ICL_FASTEST_INTERVAL_MAP_INFIX_CASES_HPP_JOFA_090702
Modified: sandbox/itl/libs/itl/test/test_interval_map_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,11 +10,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_fundamentals_4_ordered_types()
@@ -164,11 +164,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_ctor_4_bicremental_types()
@@ -229,11 +229,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_add_sub_4_bicremental_types()
@@ -283,11 +283,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_distinct_4_bicremental_types()
@@ -318,11 +318,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_distinct_4_bicremental_continuous_types()
@@ -372,11 +372,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_isolate_4_bicremental_continuous_types()
@@ -428,11 +428,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_contains_4_bicremental_types()
@@ -471,11 +471,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_contains_key_objects_4_bicremental_types()
@@ -513,11 +513,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_operators_4_bicremental_types()
@@ -556,11 +556,11 @@
// Test for nontrivial intersection of interval maps with intervals and values
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_base_intersect_4_bicremental_types()
@@ -663,11 +663,11 @@
// Test for nontrivial erasure of interval maps with intervals and interval sets
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_base_erase_4_bicremental_types()
@@ -781,11 +781,11 @@
// Test first_collision
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_base_is_disjoint_4_bicremental_types()
@@ -866,11 +866,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_flip_4_bicremental_types()
@@ -894,11 +894,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_infix_plus_overload_4_bicremental_types()
@@ -922,11 +922,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_infix_pipe_overload_4_bicremental_types()
@@ -952,11 +952,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_infix_minus_overload_4_bicremental_types()
@@ -1005,11 +1005,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_infix_et_overload_4_bicremental_types()
@@ -1055,11 +1055,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_infix_caret_overload_4_bicremental_types()
@@ -1095,11 +1095,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_find_4_bicremental_types()
@@ -1128,11 +1128,11 @@
template <template<class T, class U,
class Traits = partial_absorber,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap,
class T, class U>
void interval_map_set_4_bicremental_types()
@@ -1156,11 +1156,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void interval_map_inclusion_compare_4_bicremental_types()
@@ -1228,11 +1228,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void interval_map_std_copy_via_inserter_4_bicremental_types()
@@ -1270,11 +1270,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void interval_map_element_iter_4_discrete_types()
Modified: sandbox/itl/libs/itl/test/test_interval_quantifier_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_quantifier_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_quantifier_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,11 +12,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void make_3_itv_maps_and_derivatives_1
@@ -43,11 +43,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_plus_4_bicremental_types()
@@ -66,11 +66,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_et_4_bicremental_types()
@@ -92,11 +92,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_plus_4_bicremental_types()
@@ -115,11 +115,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_et_4_bicremental_types()
@@ -141,11 +141,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -166,11 +166,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -195,11 +195,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_4_bicremental_types()
@@ -220,11 +220,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_interval_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_interval_set_fundamentals_4_ordered_types, T, ordered_types)
@@ -60,7 +60,7 @@
(test_itl_interval_set_element_iter_4_discrete_types, T, discrete_types)
{ interval_set_element_iter_4_discrete_types<INTERVAL_SET, T>();}
-#endif // BOOST_ITL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_INTERVAL_SET_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_interval_set_infix_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_infix_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_infix_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_interval_set_infix_plus_overload_4_bicremental_types, T, bicremental_types)
@@ -28,7 +28,7 @@
(test_itl_interval_set_infix_caret_overload_4_bicremental_types, T, bicremental_types)
{ interval_set_infix_caret_overload_4_bicremental_types<INTERVAL_SET, T>();}
-#endif // BOOST_ITL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_INTERVAL_SET_INFIX_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_interval_set_laws_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_laws_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_laws_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -14,9 +14,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_monoid_plus_4_bicremental_types()
@@ -38,9 +38,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_monoid_et_4_bicremental_types()
@@ -65,9 +65,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_monoid_plus_4_bicremental_types()
@@ -89,9 +89,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_monoid_et_4_bicremental_types()
@@ -116,9 +116,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -142,9 +142,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -172,9 +172,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_group_plus_4_bicremental_types()
@@ -198,9 +198,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_group_plus_prot_inv_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_interval_set_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,9 +10,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_fundamentals_4_ordered_types()
@@ -147,9 +147,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_ctor_4_bicremental_types()
@@ -202,9 +202,9 @@
}
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_add_sub_4_bicremental_types()
@@ -246,9 +246,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_distinct_4_bicremental_types()
@@ -276,9 +276,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_distinct_4_bicremental_continuous_types()
@@ -318,9 +318,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_isolate_4_bicremental_continuous_types()
@@ -366,9 +366,9 @@
}
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_element_compare_4_bicremental_types()
@@ -412,9 +412,9 @@
}
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_contains_4_bicremental_types()
@@ -453,9 +453,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_operators_4_bicremental_types()
@@ -499,9 +499,9 @@
// Test for nontrivial intersection of interval sets with intervals and values
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_base_intersect_4_bicremental_types()
@@ -574,9 +574,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_flip_4_bicremental_types()
@@ -614,9 +614,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_infix_plus_overload_4_bicremental_types()
@@ -637,9 +637,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_infix_pipe_overload_4_bicremental_types()
@@ -662,9 +662,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_infix_minus_overload_4_bicremental_types()
@@ -686,9 +686,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_infix_et_overload_4_bicremental_types()
@@ -711,9 +711,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_infix_caret_overload_4_bicremental_types()
@@ -736,9 +736,9 @@
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_find_4_bicremental_types()
@@ -761,9 +761,9 @@
}
template <template< class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, T),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, T),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet,
class T>
void interval_set_element_iter_4_discrete_types()
Modified: sandbox/itl/libs/itl/test/test_itl_interval.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_interval.hpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_interval.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ITL_INTERVAL_HPP_JOFA_081006
-#define BOOST_ITL_TEST_ITL_INTERVAL_HPP_JOFA_081006
+#ifndef BOOST_ICL_TEST_ICL_INTERVAL_HPP_JOFA_081006
+#define BOOST_ICL_TEST_ICL_INTERVAL_HPP_JOFA_081006
template <class T, class IntervalT>
void interval_ctor_4_ordered_types()
Modified: sandbox/itl/libs/itl/test/test_itl_interval_/test_itl_interval.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_interval_/test_itl_interval.cpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_interval_/test_itl_interval.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -165,7 +165,7 @@
(fastest_itl_interval_subtract_4_bicremental_types, T, bicremental_types)
{ interval_subtract_4_bicremental_types<T>(); }
-#ifndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
BOOST_AUTO_TEST_CASE
(fastest_itl_interval_ctor_specific)
@@ -185,7 +185,7 @@
(fastest_itl_interval_infix_intersect_4_bicremental_types, T, discrete_types)
{ interval_infix_intersect_4_bicremental_types<T>(); }
-#endif // ndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#endif // ndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
Modified: sandbox/itl/libs/itl/test/test_itl_interval_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_interval_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_interval_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -10,13 +10,13 @@
#include <boost/itl/interval_set.hpp>
-template <class DomainT, ITL_COMPARE Compare,
- ITL_INTERVAL(ITL_COMPARE) Interval>
-void test_inner_complement(const ITL_INTERVAL_TYPE(Interval,DomainT,Compare)& itv1,
- const ITL_INTERVAL_TYPE(Interval,DomainT,Compare)& itv2)
+template <class DomainT, ICL_COMPARE Compare,
+ ICL_INTERVAL(ICL_COMPARE) Interval>
+void test_inner_complement(const ICL_INTERVAL_TYPE(Interval,DomainT,Compare)& itv1,
+ const ICL_INTERVAL_TYPE(Interval,DomainT,Compare)& itv2)
{
typedef interval_set<DomainT,Compare,Interval> ItvSetT;
- typedef ITL_INTERVAL_TYPE(Interval,DomainT,Compare) IntervalT;
+ typedef ICL_INTERVAL_TYPE(Interval,DomainT,Compare) IntervalT;
BOOST_CHECK_EQUAL(icl::length(inner_complement(itv1,itv2)), icl::distance(itv1,itv2));
BOOST_CHECK_EQUAL(icl::length(inner_complement(itv1,itv2)), icl::distance(itv2,itv1));
@@ -63,7 +63,7 @@
test_inner_complement<DomainT, std::less, IntervalT>(itv1, itv2);
}
-#ifndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#ifndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
void interval_ctor_specific()
{
@@ -78,7 +78,7 @@
icl::infinity<size_type_of<icl::interval<double>::type>::type >::value() );
}
-#endif // ndef ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#endif // ndef ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
template <class T>
void interval_equal_4_integral_types()
Modified: sandbox/itl/libs/itl/test/test_itl_map.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_map.hpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,11 +12,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itl_map_contains_4_bicremental_types()
@@ -49,11 +49,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itl_map_find_4_bicremental_types()
@@ -82,11 +82,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itl_map_inclusion_compare_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_itl_map_/test_itl_map_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_map_/test_itl_map_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_map_/test_itl_map_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_itl_map_find_4_bicremental_types, T, discrete_types)
@@ -16,4 +16,4 @@
(test_itl_itl_map_inclusion_compare_4_bicremental_types, T, discrete_types)
{ itl_map_inclusion_compare_4_bicremental_types<T, int, partial_absorber, INTERVAL_MAP>();}
-#endif // BOOST_ITL_TEST_ITL_MAP_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_ICL_MAP_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_laws.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_laws.hpp (original)
+++ sandbox/itl/libs/itl/test/test_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_LIBS_ICL_TEST_ITL_LAWS_HPP_JOFA_090119
-#define BOOST_LIBS_ICL_TEST_ITL_LAWS_HPP_JOFA_090119
+#ifndef BOOST_LIBS_ICL_TEST_ICL_LAWS_HPP_JOFA_090119
+#define BOOST_LIBS_ICL_TEST_ICL_LAWS_HPP_JOFA_090119
#include <boost/itl/type_traits/identity_element.hpp>
Modified: sandbox/itl/libs/itl/test/test_partial_interval_quantifier_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_partial_interval_quantifier_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_partial_interval_quantifier_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
//------------------------------------------------------------------------------
// partial_absorber
@@ -60,5 +60,5 @@
// partial x - x == 0 x - x =p= 0 partiality of subtraction
// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
-#endif // BOOST_ITL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_PARTIAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_quantifier_itl_map.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_quantifier_itl_map.hpp (original)
+++ sandbox/itl/libs/itl/test/test_quantifier_itl_map.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -15,11 +15,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_plus_4_bicremental_types()
@@ -48,11 +48,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_et_4_bicremental_types()
@@ -84,11 +84,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_plus_4_bicremental_types()
@@ -117,11 +117,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_et_4_bicremental_types()
@@ -153,11 +153,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -188,11 +188,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -227,11 +227,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_4_bicremental_types()
@@ -262,11 +262,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_quantifier_map_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_quantifier_map_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_quantifier_map_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -15,11 +15,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_plus_4_bicremental_types()
@@ -42,11 +42,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_monoid_et_4_bicremental_types()
@@ -72,11 +72,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_plus_4_bicremental_types()
@@ -99,11 +99,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_monoid_et_4_bicremental_types()
@@ -129,11 +129,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -158,11 +158,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -191,11 +191,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_4_bicremental_types()
@@ -220,11 +220,11 @@
template <class T, class U, class Trt,
template<class T, class U,
class Traits = Trt,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_COMBINE Combine = ITL_COMBINE_INSTANCE(icl::inplace_plus, U),
- ITL_SECTION Section = ITL_SECTION_INSTANCE(icl::inter_section, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_COMBINE Combine = ICL_COMBINE_INSTANCE(icl::inplace_plus, U),
+ ICL_SECTION Section = ICL_SECTION_INSTANCE(icl::inter_section, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalMap
>
void itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_set_interval_set_/test_set_interval_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_interval_set_/test_set_interval_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_set_interval_set_/test_set_interval_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
//------------------------------------------------------------------------------
// interval_set
@@ -67,5 +67,5 @@
(test_itl_split_interval_set_check_partial_invertive_monoid_plus_4_bicremental_types, T, bicremental_types)
{ interval_set_check_partial_invertive_monoid_plus_4_bicremental_types<T, split_interval_set>();}
-#endif // BOOST_ITL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_SET_INTERVAL_SET_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_set_interval_set_shared.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_interval_set_shared.hpp (original)
+++ sandbox/itl/libs/itl/test/test_set_interval_set_shared.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,9 +12,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void make_3_interval_sets_and_derivatives_1
@@ -44,9 +44,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_monoid_plus_4_bicremental_types()
@@ -68,9 +68,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_monoid_et_4_bicremental_types()
@@ -96,9 +96,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_monoid_plus_4_bicremental_types()
@@ -120,9 +120,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_abelian_monoid_et_4_bicremental_types()
@@ -148,9 +148,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_partial_invertive_monoid_plus_4_bicremental_types()
@@ -176,9 +176,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void interval_set_check_containedness_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_set_itl_set.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_itl_set.hpp (original)
+++ sandbox/itl/libs/itl/test/test_set_itl_set.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -14,9 +14,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void itl_set_check_monoid_plus_4_bicremental_types()
@@ -45,9 +45,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void itl_set_check_monoid_et_4_bicremental_types()
@@ -79,9 +79,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void itl_set_check_abelian_monoid_plus_4_bicremental_types()
@@ -109,9 +109,9 @@
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void itl_set_check_abelian_monoid_et_4_bicremental_types()
@@ -143,9 +143,9 @@
//------------------------------------------------------------------------------
template <class T,
template<class T,
- ITL_COMPARE Compare = ITL_COMPARE_INSTANCE(std::less, U),
- ITL_INTERVAL(ITL_COMPARE) Interval = ITL_INTERVAL_INSTANCE(ITL_INTERVAL_DEFAULT, T, Compare),
- ITL_ALLOC Alloc = std::allocator
+ ICL_COMPARE Compare = ICL_COMPARE_INSTANCE(std::less, U),
+ ICL_INTERVAL(ICL_COMPARE) Interval = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, T, Compare),
+ ICL_ALLOC Alloc = std::allocator
>class IntervalSet
>
void itl_set_check_partial_invertive_monoid_plus_4_bicremental_types()
Modified: sandbox/itl/libs/itl/test/test_set_itl_set_/test_set_itl_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_itl_set_/test_set_itl_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_set_itl_set_/test_set_itl_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
//------------------------------------------------------------------------------
// interval_set
@@ -30,6 +30,6 @@
(test_itl_itl_set_check_partial_invertive_monoid_plus_4_bicremental_types, T, discrete_types)
{ itl_set_check_partial_invertive_monoid_plus_4_bicremental_types<T, interval_set>();}
-#endif // BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_set_itl_set_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_itl_set_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_set_itl_set_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_itl_set_check_monoid_plus_4_bicremental_types, T, discrete_types)
@@ -24,6 +24,6 @@
(test_itl_itl_set_check_partial_invertive_monoid_plus_4_bicremental_types, T, discrete_types)
{ itl_set_check_partial_invertive_monoid_plus_4_bicremental_types<T, INTERVAL_SET>();}
-#endif // BOOST_ITL_TEST_SET_ITL_SET_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_SET_ICL_SET_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_total_interval_quantifier_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_total_interval_quantifier_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_total_interval_quantifier_cases.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
-#define BOOST_ITL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#ifndef BOOST_ICL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#define BOOST_ICL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
//------------------------------------------------------------------------------
// total_absorber
@@ -77,5 +77,5 @@
// partial x - x == 0 x - x =p= 0 partiality of subtraction
// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
-#endif // BOOST_ITL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
+#endif // BOOST_ICL_TEST_TOTAL_INTERVAL_QUANTIFIER_CASES_HPP_JOFA_090701
Modified: sandbox/itl/libs/itl/test/test_type_lists.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_type_lists.hpp (original)
+++ sandbox/itl/libs/itl/test/test_type_lists.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_TYPE_LISTS_HPP_JOFA_080916
-#define BOOST_ITL_TEST_TYPE_LISTS_HPP_JOFA_080916
+#ifndef BOOST_ICL_TEST_TYPE_LISTS_HPP_JOFA_080916
+#define BOOST_ICL_TEST_TYPE_LISTS_HPP_JOFA_080916
#include <boost/mpl/list.hpp>
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 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_VALUE_MAKER_HPP_JOFA_080916
-#define BOOST_ITL_TEST_VALUE_MAKER_HPP_JOFA_080916
+#ifndef BOOST_ICL_TEST_VALUE_MAKER_HPP_JOFA_080916
+#define BOOST_ICL_TEST_VALUE_MAKER_HPP_JOFA_080916
#include <boost/itl/type_traits/identity_element.hpp>
#include <boost/itl/interval_bounds.hpp>
Modified: sandbox/itl/libs/itl/test/unit_test_unwarned.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/unit_test_unwarned.hpp (original)
+++ sandbox/itl/libs/itl/test/unit_test_unwarned.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -5,8 +5,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
-#define BOOST_ITL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
+#ifndef BOOST_ICL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
+#define BOOST_ICL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
#include <boost/detail/workaround.hpp>
@@ -22,5 +22,5 @@
#endif
-#endif // BOOST_ITL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
+#endif // BOOST_ICL_TEST_UNIT_TEST_UNWARNED_HPP_JOFA_091204
Modified: sandbox/itl/libs/itl_xt/example/history_/history.cpp
==============================================================================
--- sandbox/itl/libs/itl_xt/example/history_/history.cpp (original)
+++ sandbox/itl/libs/itl_xt/example/history_/history.cpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -12,7 +12,7 @@
#include <iostream>
// Prior to other includes for interval containers we define ...
-#define ITL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
+#define ICL_USE_STATIC_INTERVAL_BORDER_DEFAULTS
// ... so all interval containers will use right_open_intervals that
// has static interval borders.
Modified: sandbox/itl/libs/validate/example/labat_polygon_/polygon_gentor.hpp
==============================================================================
--- sandbox/itl/libs/validate/example/labat_polygon_/polygon_gentor.hpp (original)
+++ sandbox/itl/libs/validate/example/labat_polygon_/polygon_gentor.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -93,7 +93,7 @@
void polygon_gentor<PolygonT>::last(PolygonT& x)const
{
x.clear();
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
}
template <class PolygonT>
@@ -104,13 +104,13 @@
SampleTypeTD perm;
NumberGentorT<int> intGentor;
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor(2) ) perm.push_back(*it);
else perm.push_front(*it);
}
- ITL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
+ ICL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
}
@@ -194,7 +194,7 @@
void polygon_set_gentor<PolygonSetT>::last(PolygonSetT& x)const
{
x.clear();
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample) x.insert(*it);
}
template <class PolygonSetT>
@@ -205,13 +205,13 @@
SampleTypeTD perm;
NumberGentorT<int> intGentor;
- ITL_const_FORALL(typename SampleTypeTD, it, m_sample)
+ ICL_const_FORALL(typename SampleTypeTD, it, m_sample)
{
if( 0==intGentor(2) ) perm.push_back(*it);
else perm.push_front(*it);
}
- ITL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
+ ICL_const_FORALL(typename SampleTypeTD, pit, perm) x.insert(*pit);
}
Modified: sandbox/itl/libs/validate/example/labat_polygon_/polygon_laws.hpp
==============================================================================
--- sandbox/itl/libs/validate/example/labat_polygon_/polygon_laws.hpp (original)
+++ sandbox/itl/libs/validate/example/labat_polygon_/polygon_laws.hpp 2010-10-19 13:52:52 EDT (Tue, 19 Oct 2010)
@@ -7,8 +7,8 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#ifndef BOOST_ITL_POLYGON_LAWS_HPP_JOFA_090901
-#define BOOST_ITL_POLYGON_LAWS_HPP_JOFA_090901
+#ifndef BOOST_ICL_POLYGON_LAWS_HPP_JOFA_090901
+#define BOOST_ICL_POLYGON_LAWS_HPP_JOFA_090901
#define LAW_BASED_TEST_BOOST_POLYGON
@@ -163,5 +163,5 @@
}} // namespace icl boost
-#endif // BOOST_ITL_POLYGON_LAWS_HPP_JOFA_070411
+#endif // BOOST_ICL_POLYGON_LAWS_HPP_JOFA_070411
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