|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49680 - in sandbox/itl/boost: itl itl_xt
From: afojgo_at_[hidden]
Date: 2008-11-10 23:47:19
Author: jofaber
Date: 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
New Revision: 49680
URL: http://svn.boost.org/trac/boost/changeset/49680
Log:
Refactored itl::set template template parameter Compare to template class parameter. Stable {msvc-9.0}
Text files modified:
sandbox/itl/boost/itl/interval_base_set.hpp | 6 ++--
sandbox/itl/boost/itl/interval_set.hpp | 6 ++--
sandbox/itl/boost/itl/map.hpp | 4 +-
sandbox/itl/boost/itl/separate_interval_set.hpp | 6 ++--
sandbox/itl/boost/itl/set.hpp | 44 ++++++++++++++++++++--------------------
sandbox/itl/boost/itl/split_interval_set.hpp | 6 ++--
sandbox/itl/boost/itl_xt/episode_set.hpp | 4 +-
sandbox/itl/boost/itl_xt/tuple_computer.hpp | 6 ++--
8 files changed, 41 insertions(+), 41 deletions(-)
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 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -149,13 +149,13 @@
typedef Alloc<DomainT> domain_allocator_type;
/// The type of the set of elements that is equivalent to the set of intervals
- typedef typename itl::set<DomainT,Compare,Alloc> element_set;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> element_set;
/// The corresponding atomized type representing this interval container of elements
- typedef typename itl::set<DomainT,Compare,Alloc> atomized_type;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename itl::set<interval_type,exclusive_less,Alloc> ImplSetT;
+ typedef typename itl::set<interval_type,exclusive_less<interval_type>,Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
Modified: sandbox/itl/boost/itl/interval_set.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_set.hpp (original)
+++ sandbox/itl/boost/itl/interval_set.hpp 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -143,13 +143,13 @@
typedef Alloc<DomainT> domain_allocator_type;
/// The type of the set of elements that is equivalent to the set of intervals
- typedef typename itl::set<DomainT,Compare,Alloc> element_set;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> element_set;
/// The corresponding atomized type representing this interval container of elements
- typedef typename itl::set<DomainT,Compare,Alloc> atomized_type;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename itl::set<interval_type,exclusive_less,Alloc> ImplSetT;
+ typedef typename itl::set<interval_type,exclusive_less<interval_type>,Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
Modified: sandbox/itl/boost/itl/map.hpp
==============================================================================
--- sandbox/itl/boost/itl/map.hpp (original)
+++ sandbox/itl/boost/itl/map.hpp 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -114,8 +114,8 @@
typedef typename itl::map<KeyT, DataT, Traits, Compare, Alloc> type;
typedef typename std::map<KeyT, DataT, Compare<KeyT>,
- allocator_type> base_type;
- typedef typename itl::set<KeyT, Compare, Alloc > set_type;
+ allocator_type> base_type;
+ typedef typename itl::set<KeyT,Compare<KeyT>,Alloc> set_type;
typedef itl::map<KeyT, DataT, itl::neutron_absorber, Compare, Alloc>
neutron_absorber_type;
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 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -108,13 +108,13 @@
typedef Alloc<DomainT> domain_allocator_type;
/// The type of the set of elements that is equivalent to the set of intervals
- typedef typename itl::set<DomainT,Compare,Alloc> element_set;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> element_set;
/// The corresponding atomized type representing this interval container of elements
- typedef typename itl::set<DomainT,Compare,Alloc> atomized_type;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename itl::set<interval_type,exclusive_less,Alloc> ImplSetT;
+ typedef typename itl::set<interval_type,exclusive_less<interval_type>,Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
Modified: sandbox/itl/boost/itl/set.hpp
==============================================================================
--- sandbox/itl/boost/itl/set.hpp (original)
+++ sandbox/itl/boost/itl/set.hpp 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -69,21 +69,21 @@
template
<
typename KeyT,
- template<class>class Compare = std::less,
+ class Compare = std::less<KeyT>,
template<class>class Alloc = std::allocator
>
- class set: private std::set<KeyT, Compare<KeyT>, Alloc<KeyT> >
+ class set: private std::set<KeyT, Compare, Alloc<KeyT> >
{
public:
- typedef typename itl::set<KeyT, Compare, Alloc > type;
- typedef typename std::set<KeyT, Compare<KeyT>, Alloc<KeyT> > base_type;
+ typedef typename itl::set<KeyT, Compare, Alloc > type;
+ typedef typename std::set<KeyT, Compare, Alloc<KeyT> > base_type;
public:
typedef KeyT key_type;
typedef KeyT value_type;
typedef KeyT data_type;
- typedef Compare<KeyT> key_compare;
- typedef Compare<KeyT> value_compare;
+ typedef Compare key_compare;
+ typedef Compare value_compare;
typedef Alloc<KeyT> allocator_type;
public:
@@ -100,8 +100,8 @@
public:
set(){}
- set(const Compare<KeyT>& comp):
- std::set<KeyT, Compare<KeyT>, Alloc<KeyT> >(comp){}
+ set(const Compare& comp):
+ std::set<KeyT, Compare, Alloc<KeyT> >(comp){}
template <class InputIterator>
set(InputIterator f, InputIterator l): std::set<InputIterator>(f,l) {}
@@ -213,47 +213,47 @@
/** Standard equality, which is lexicographical equality of the sets
as sequences, that are given by their Compare order. */
- template <typename KeyT, template<class>class Compare, template<class>class Alloc>
+ template <typename KeyT, class Compare, template<class>class Alloc>
inline bool operator == (const itl::set<KeyT,Compare,Alloc>& lhs,
const itl::set<KeyT,Compare,Alloc>& rhs)
{
- typedef std::set<KeyT,Compare<KeyT>,Alloc<KeyT> > base_type;
+ typedef std::set<KeyT,Compare,Alloc<KeyT> > base_type;
return operator==((const base_type&)lhs, (const base_type&)rhs);
}
/** Element equality. Two sets are equal if they contain the same
elements */
- template <typename KeyT, template<class>class Compare,
+ template <typename KeyT, class Compare,
template<class>class Alloc>
inline bool is_element_equal(const itl::set<KeyT,Compare,Alloc>& lhs,
const itl::set<KeyT,Compare,Alloc>& rhs)
{
- typedef std::set<KeyT,Compare<KeyT>,Alloc<KeyT> > base_type;
+ typedef std::set<KeyT,Compare,Alloc<KeyT> > base_type;
return operator==((const base_type&)lhs, (const base_type&)rhs);
}
/** Strict weak less ordering which is given by the Compare order */
- template <typename KeyT, template<class>class Compare,
+ template <typename KeyT, class Compare,
template<class>class Alloc>
inline bool operator < (const itl::set<KeyT,Compare,Alloc>& lhs,
const itl::set<KeyT,Compare,Alloc>& rhs)
{
- typedef std::set<KeyT,Compare<KeyT>,Alloc<KeyT> > base_type;
+ typedef std::set<KeyT,Compare,Alloc<KeyT> > base_type;
return operator<((const base_type&)lhs, (const base_type&)rhs);
}
/** Partial ordering which is induced by Compare */
- template <typename KeyT, template<class>class Compare,
+ template <typename KeyT, class Compare,
template<class>class Alloc>
inline bool operator <= (const itl::set<KeyT,Compare,Alloc>& lhs,
const itl::set<KeyT,Compare,Alloc>& rhs)
{
- typedef std::set<KeyT,Compare<KeyT>,Alloc<KeyT> > base_type;
+ typedef std::set<KeyT,Compare,Alloc<KeyT> > base_type;
return operator<=((const base_type&)lhs, (const base_type&)rhs);
}
- template <typename KeyT, template<class>class Compare,
+ template <typename KeyT, class Compare,
template<class>class Alloc>
typename set<KeyT,Compare,Alloc>::iterator
set<KeyT,Compare,Alloc>::subtract(const value_type& val)
@@ -266,7 +266,7 @@
}
- template <typename KeyT, template<class>class Compare, template<class>class Alloc>
+ template <typename KeyT, class Compare, template<class>class Alloc>
std::string set<KeyT,Compare,Alloc>::as_string(const char* sep)const
{
const_iterator it_ = begin();
@@ -281,7 +281,7 @@
}
- template <typename KeyT, template<class>class Compare, template<class>class Alloc>
+ template <typename KeyT, class Compare, template<class>class Alloc>
template<class Predicate>
set<KeyT,Compare,Alloc>& set<KeyT,Compare,Alloc>
::erase_if(const Predicate& pred)
@@ -295,7 +295,7 @@
}
- template <typename KeyT, template<class>class Compare, template<class>class Alloc>
+ template <typename KeyT, class Compare, template<class>class Alloc>
template<class Predicate>
set<KeyT,Compare,Alloc>& set<KeyT,Compare,Alloc>
::assign_if(const set<KeyT,Compare,Alloc>& src, const Predicate& pred)
@@ -311,7 +311,7 @@
//-------------------------------------------------------------------------
template <typename KeyT,
- template<class>class Compare, template<class>class Alloc>
+ class Compare, template<class>class Alloc>
set<KeyT,Compare,Alloc>&
insert( set<KeyT,Compare,Alloc>& object,
const set<KeyT,Compare,Alloc>& insertee)
@@ -320,7 +320,7 @@
}
template <typename KeyT,
- template<class>class Compare, template<class>class Alloc>
+ class Compare, template<class>class Alloc>
set<KeyT,Compare,Alloc>&
erase( set<KeyT,Compare,Alloc>& object,
const set<KeyT,Compare,Alloc>& erasee)
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 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -126,13 +126,13 @@
typedef Alloc<DomainT> domain_allocator_type;
/// The type of the set of elements that is equivalent to the set of intervals
- typedef typename itl::set<DomainT,Compare,Alloc> element_set;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> element_set;
/// The corresponding atomized type representing this interval container of elements
- typedef typename itl::set<DomainT,Compare,Alloc> atomized_type;
+ typedef typename itl::set<DomainT,Compare<DomainT>,Alloc> atomized_type;
/// Container type for the implementation
- typedef typename itl::set<interval_type,exclusive_less,Alloc> ImplSetT;
+ typedef typename itl::set<interval_type,exclusive_less<interval_type>,Alloc> ImplSetT;
/// key type of the implementing container
typedef typename ImplSetT::key_type key_type;
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 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -67,11 +67,11 @@
@author Joachim Faulhaber
*/
template <class TimeT, class TypeDomain>
-class episode_set : public itl::set<typed_episode<TimeT, TypeDomain>*, Less_TypedEpisodeATP >
+class episode_set : public itl::set<typed_episode<TimeT, TypeDomain>*, Less_TypedEpisodeATP<typed_episode<TimeT, TypeDomain>*> >
{
// all elements must have the same type from TypeDomain
public:
- typedef itl::set<typed_episode<TimeT, TypeDomain>*, Less_TypedEpisodeATP > base_type;
+ typedef itl::set<typed_episode<TimeT, TypeDomain>*, Less_TypedEpisodeATP<typed_episode<TimeT, TypeDomain>*> > base_type;
typedef typename base_type::iterator iterator;
typedef typename base_type::const_iterator const_iterator;
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 2008-11-10 23:47:18 EST (Mon, 10 Nov 2008)
@@ -43,7 +43,7 @@
public:
typedef var_tuple<VarCount> var_tuple_type;
typedef var_tuple_order<var_tuple_type> tuple_order_type;
- typedef itl::set<var_tuple_type, var_tuple_order> tuple_set_type;
+ typedef itl::set<var_tuple_type, var_tuple_order<var_tuple_type> > tuple_set_type;
public:
virtual ~tuple_computer_interface(){};
@@ -339,7 +339,7 @@
typedef tuple_computer_base<VarCount, counter_type> base_type;
typedef typename base_type::var_tuple_type var_tuple_type;
typedef typename base_type::key_compare key_compare;
- typedef typename itl::set<var_tuple_type, var_tuple_order>
+ typedef typename itl::set<var_tuple_type, var_tuple_order<var_tuple_type> >
tuple_set_type;
public:
@@ -392,7 +392,7 @@
typedef tuple_computer_base<VarCount, counter_type> base_type;
typedef typename base_type::var_tuple_type var_tuple_type;
typedef typename base_type::key_compare key_compare;
- typedef itl::set<var_tuple_type, var_tuple_order> tuple_set_type;
+ typedef itl::set<var_tuple_type, var_tuple_order<var_tuple_type> > tuple_set_type;
typedef typename base_type::counter_type::interval_type interval_type;
private:
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