Subject: [Boost-commit] svn:boost r56062 - sandbox/itl/boost/itl/type_traits
From: afojgo_at_[hidden]
Date: 2009-09-06 09:58:11
Author: jofaber
Date: 2009-09-06 09:58:10 EDT (Sun, 06 Sep 2009)
New Revision: 56062
URL: http://svn.boost.org/trac/boost/changeset/56062
Log:
Changed meta non const expressions to const expressions.
Text files modified:
sandbox/itl/boost/itl/type_traits/is_combinable.hpp | 20 +++++++++++++-------
sandbox/itl/boost/itl/type_traits/is_interval_container.hpp | 4 +++-
2 files changed, 16 insertions(+), 8 deletions(-)
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 2009-09-06 09:58:10 EDT (Sun, 06 Sep 2009)
@@ -236,7 +236,7 @@
mpl::and_
<
is_interval_set<GuideT>
- , mpl::or_
+ , mpl::or_
<
is_interval_set_derivative<GuideT, CompanionT>
, is_concept_compatible<is_interval_set, GuideT, CompanionT>
@@ -409,9 +409,12 @@
{
typedef is_coarser_interval_set_companion<GuideT, CompanionT> type;
static const bool value =
- is_interval_set_companion<GuideT, CompanionT>::value
- && ( segmentational_fineness<GuideT>::value
- > segmentational_fineness<CompanionT>::value);
+ mpl::and_
+ <
+ is_interval_set_companion<GuideT, CompanionT>
+ , mpl::bool_<( segmentational_fineness<GuideT>::value
+ > segmentational_fineness<CompanionT>::value)>
+ >::value;
};
template<class GuideT, class CompanionT>
@@ -419,9 +422,12 @@
{
typedef is_coarser_interval_map_companion<GuideT, CompanionT> type;
static const bool value =
- is_interval_map_companion<GuideT, CompanionT>::value
- && ( segmentational_fineness<GuideT>::value
- > segmentational_fineness<CompanionT>::value);
+ mpl::and_
+ <
+ is_interval_map_companion<GuideT, CompanionT>
+ , mpl::bool_<( segmentational_fineness<GuideT>::value
+ > segmentational_fineness<CompanionT>::value)>
+ >::value;
};
//------------------------------------------------------------------------------
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 2009-09-06 09:58:10 EDT (Sun, 06 Sep 2009)
@@ -8,6 +8,8 @@
#ifndef __itl_type_traits_is_interval_container_JOFA_081004_H__
#define __itl_type_traits_is_interval_container_JOFA_081004_H__
+#include <boost/mpl/and.hpp>
+
namespace boost{ namespace itl
{
template <class Type> struct is_interval_container
@@ -21,7 +23,7 @@
{
typedef is_interval_map<Type> type;
static const bool value =
- is_interval_container<Type>::value && is_map<Type>::value;
+ mpl::and_<is_interval_container<Type>, is_map<Type> >::value;
};
template<class Type>