Subject: [Boost-commit] svn:boost r66316 - in sandbox/icl/boost: icl icl/detail icl/type_traits icl_xt
From: afojgo_at_[hidden]
Date: 2010-11-01 11:53:37
Author: jofaber
Date: 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
New Revision: 66316
URL: http://svn.boost.org/trac/boost/changeset/66316
Log:
Adaptions for gcc-4.4.1.
Text files modified:
sandbox/icl/boost/icl/detail/interval_morphism.hpp | 4 +++-
sandbox/icl/boost/icl/predicates.hpp | 4 ++--
sandbox/icl/boost/icl/type_traits/infinity.hpp | 3 ++-
sandbox/icl/boost/icl_xt/interval_bitset.hpp | 4 ++--
sandbox/icl/boost/icl_xt/map_segment_gentor.hpp | 3 ++-
5 files changed, 11 insertions(+), 7 deletions(-)
Modified: sandbox/icl/boost/icl/detail/interval_morphism.hpp
==============================================================================
--- sandbox/icl/boost/icl/detail/interval_morphism.hpp (original)
+++ sandbox/icl/boost/icl/detail/interval_morphism.hpp 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
@@ -13,6 +13,8 @@
#include <boost/icl/concept/element_set_value.hpp>
#include <boost/icl/concept/set_value.hpp>
#include <boost/icl/concept/map_value.hpp>
+#include <boost/icl/associative_interval_container.hpp>
+#include <boost/icl/associative_element_container.hpp>
namespace boost{namespace icl
{
@@ -27,7 +29,7 @@
typename IntervalContainerT::codomain_type coval = icl::co_value<IntervalContainerT>(itv_);
for(typename IntervalContainerT::domain_type element = first(itv); element <= last(itv); ++element)
- insert(result, icl::make_value<ElementContainerT>(element, coval));
+ icl::insert(result, icl::make_value<ElementContainerT>(element, coval));
}
}
Modified: sandbox/icl/boost/icl/predicates.hpp
==============================================================================
--- sandbox/icl/boost/icl/predicates.hpp (original)
+++ sandbox/icl/boost/icl/predicates.hpp 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
@@ -106,7 +106,7 @@
is contained in <tt>super</tt> */
bool operator()(const Type& sub, const Type& super)const
{
- return contains(super, sub);
+ return icl::contains(super, sub);
}
};
@@ -123,7 +123,7 @@
<tt>sub</tt> */
bool operator()(const Type& super, const Type& sub)const
{
- return contains(super, sub);
+ return icl::contains(super, sub);
}
};
Modified: sandbox/icl/boost/icl/type_traits/infinity.hpp
==============================================================================
--- sandbox/icl/boost/icl/type_traits/infinity.hpp (original)
+++ sandbox/icl/boost/icl/type_traits/infinity.hpp 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
@@ -9,6 +9,7 @@
#define BOOST_ICL_TYPE_TRAITS_INFINITY_HPP_JOFA_100322
#include <string>
+#include <boost/static_assert.hpp>
#include <boost/icl/type_traits/is_numeric.hpp>
#include <boost/mpl/if.hpp>
@@ -26,7 +27,7 @@
static Type value()
{
- BOOST_CONCEPT_ASSERT((is_numeric<Type>));
+ BOOST_STATIC_ASSERT((is_numeric<Type>::value));
if(std::numeric_limits<Type>::has_infinity)
return std::numeric_limits<Type>::infinity();
else
Modified: sandbox/icl/boost/icl_xt/interval_bitset.hpp
==============================================================================
--- sandbox/icl/boost/icl_xt/interval_bitset.hpp (original)
+++ sandbox/icl/boost/icl_xt/interval_bitset.hpp 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
@@ -497,7 +497,7 @@
template<class CharType, class CharTraits,
class DomainT, class BitSetT,
- ICL_COMPARE Compare, template<class,ICL_COMPARE>class Interval, ICL_ALLOC Alloc>
+ ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) 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)
@@ -514,7 +514,7 @@
//-----------------------------------------------------------------------------
// type representation
//-----------------------------------------------------------------------------
-template <class DomainT, class BitSetT, ICL_COMPARE Compare, template<class,ICL_COMPARE>class Interval, ICL_ALLOC Alloc>
+template <class DomainT, class BitSetT, ICL_COMPARE Compare, ICL_INTERVAL(ICL_COMPARE) Interval, ICL_ALLOC Alloc>
struct type_to_string<icl::interval_bitset<DomainT,BitSetT,Compare,Interval,Alloc> >
{
static std::string apply()
Modified: sandbox/icl/boost/icl_xt/map_segment_gentor.hpp
==============================================================================
--- sandbox/icl/boost/icl_xt/map_segment_gentor.hpp (original)
+++ sandbox/icl/boost/icl_xt/map_segment_gentor.hpp 2010-11-01 11:53:26 EDT (Mon, 01 Nov 2010)
@@ -11,6 +11,7 @@
#define BOOST_ICL_XT_MAP_SEGMENT_GENTOR_HPP_JOFA_091004
+#include <boost/icl/interval.hpp>
#include <boost/icl_xt/gentorit.hpp>
#include <boost/icl_xt/numbergentor.hpp>
#include <boost/icl_xt/itvgentor.hpp>
@@ -19,7 +20,7 @@
namespace boost{namespace icl
{
-template <class DomainT, class CodomainT, class IntervalT = icl::interval<DomainT>::type >
+template <class DomainT, class CodomainT, class IntervalT = typename icl::interval<DomainT>::type >
class map_segment_gentor: public RandomGentorAT<std::pair<IntervalT, CodomainT> >
{
public: