From 91f47b7bc629b116562d35b05c3476bf16f34d42 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Sun, 30 Aug 2009 10:23:32 +0000
Subject: [PATCH] Merged patchset 44631 from trunk. Resolves parenthesis
 warnings on GCC 4.3. Fixes #2321.

[SVN r55872]
---
 .../function_types/detail/pp_retag_default_cc/master.hpp      | 4 ++--
 .../detail/pp_retag_default_cc/preprocessed.hpp               | 4 ++--
 include/boost/function_types/detail/pp_tags/master.hpp        | 2 +-
 include/boost/function_types/detail/pp_tags/preprocessed.hpp  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/function_types/detail/pp_retag_default_cc/master.hpp b/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
index f97d385..865efce 100644
--- a/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
+++ b/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
@@ -30,8 +30,8 @@ namespace detail
 #   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))
     ));
   };
 
diff --git a/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp b/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
index c21a4fd..72666d0 100644
--- a/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
+++ b/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
@@ -15,8 +15,8 @@ namespace detail
 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; 
diff --git a/include/boost/function_types/detail/pp_tags/master.hpp b/include/boost/function_types/detail/pp_tags/master.hpp
index 783b93c..9cce212 100644
--- a/include/boost/function_types/detail/pp_tags/master.hpp
+++ b/include/boost/function_types/detail/pp_tags/master.hpp
@@ -82,7 +82,7 @@ namespace detail {
     );
 
     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 =
diff --git a/include/boost/function_types/detail/pp_tags/preprocessed.hpp b/include/boost/function_types/detail/pp_tags/preprocessed.hpp
index 811d62a..823c3cc 100644
--- a/include/boost/function_types/detail/pp_tags/preprocessed.hpp
+++ b/include/boost/function_types/detail/pp_tags/preprocessed.hpp
@@ -53,7 +53,7 @@ BOOST_STATIC_CONSTANT(bool, match =
 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