Subject: [Boost-commit] svn:boost r55872 - in branches/release/boost/function_types/detail: pp_retag_default_cc pp_tags
From: andrey.semashev_at_[hidden]
Date: 2009-08-30 06:23:32
Author: andysem
Date: 2009-08-30 06:23:32 EDT (Sun, 30 Aug 2009)
New Revision: 55872
URL: http://svn.boost.org/trac/boost/changeset/55872
Log:
Merged patchset 44631 from trunk. Resolves parenthesis warnings on GCC 4.3. Fixes #2321.
Text files modified:
branches/release/boost/function_types/detail/pp_retag_default_cc/master.hpp | 4 ++--
branches/release/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp | 4 ++--
branches/release/boost/function_types/detail/pp_tags/master.hpp | 2 +-
branches/release/boost/function_types/detail/pp_tags/preprocessed.hpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
Modified: branches/release/boost/function_types/detail/pp_retag_default_cc/master.hpp
==============================================================================
--- branches/release/boost/function_types/detail/pp_retag_default_cc/master.hpp (original)
+++ branches/release/boost/function_types/detail/pp_retag_default_cc/master.hpp 2009-08-30 06:23:32 EDT (Sun, 30 Aug 2009)
@@ -30,8 +30,8 @@
# include BOOST_PP_ASSIGN_SLOT(1)
BOOST_STATIC_CONSTANT(bits_t, value = (
- ::boost::function_types::detail::bits<Tag>::value & BOOST_FT_default_cc
- | ::boost::function_types::detail::bits<RefTag>::value & BOOST_PP_SLOT(1)
+ (::boost::function_types::detail::bits<Tag>::value & BOOST_FT_default_cc)
+ | (::boost::function_types::detail::bits<RefTag>::value & BOOST_PP_SLOT(1))
));
};
Modified: branches/release/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
==============================================================================
--- branches/release/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp (original)
+++ branches/release/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp 2009-08-30 06:23:32 EDT (Sun, 30 Aug 2009)
@@ -15,8 +15,8 @@
template<class Tag, class RefTag> struct selector_bits
{
BOOST_STATIC_CONSTANT(bits_t, value = (
-::boost::function_types::detail::bits<Tag> ::value & 0x00008000
-| ::boost::function_types::detail::bits<RefTag> ::value & 802
+(::boost::function_types::detail::bits<Tag> ::value & 0x00008000)
+| (::boost::function_types::detail::bits<RefTag> ::value & 802)
));
};
template<bits_t SelectorBits> struct default_cc_tag;
Modified: branches/release/boost/function_types/detail/pp_tags/master.hpp
==============================================================================
--- branches/release/boost/function_types/detail/pp_tags/master.hpp (original)
+++ branches/release/boost/function_types/detail/pp_tags/master.hpp 2009-08-30 06:23:32 EDT (Sun, 30 Aug 2009)
@@ -82,7 +82,7 @@
);
BOOST_STATIC_CONSTANT(bits_t, combined_bits =
- LHS_bits & ~RHS_mask | RHS_bits
+ (LHS_bits & ~RHS_mask) | RHS_bits
);
BOOST_STATIC_CONSTANT(bits_t, combined_mask =
Modified: branches/release/boost/function_types/detail/pp_tags/preprocessed.hpp
==============================================================================
--- branches/release/boost/function_types/detail/pp_tags/preprocessed.hpp (original)
+++ branches/release/boost/function_types/detail/pp_tags/preprocessed.hpp 2009-08-30 06:23:32 EDT (Sun, 30 Aug 2009)
@@ -53,7 +53,7 @@
RHS_bits == (LHS_bits & RHS_mask & (RHS_bits | ~0x000000ff))
);
BOOST_STATIC_CONSTANT(bits_t, combined_bits =
-LHS_bits & ~RHS_mask | RHS_bits
+(LHS_bits & ~RHS_mask) | RHS_bits
);
BOOST_STATIC_CONSTANT(bits_t, combined_mask =
LHS_mask | RHS_mask