From 516f30a307f5b4785e1a45cd619339d55a487035 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 24 Mar 2002 15:51:50 +0000
Subject: [PATCH] fixes for older KCCs

[SVN r13258]
---
 include/boost/python/class.hpp                | 9 ++++++---
 include/boost/python/object/select_holder.hpp | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
index cff0adf9..166ced73 100644
--- a/include/boost/python/class.hpp
+++ b/include/boost/python/class.hpp
@@ -245,9 +245,12 @@ namespace detail
     template <class T, class Prev>
     struct select_held_type
         : mpl::select_type<
-        !(specifies_bases<T>::value  | is_same<T,noncopyable>::value)
-                , T
-                , Prev
+            type_traits::ice_or<
+                type_traits::ice_not<specifies_bases<T>::value>::value
+               , is_same<T,noncopyable>::value
+            >::value
+            , T
+            , Prev
           >
     {
     };
diff --git a/include/boost/python/object/select_holder.hpp b/include/boost/python/object/select_holder.hpp
index 39d50c0a..72446358 100644
--- a/include/boost/python/object/select_holder.hpp
+++ b/include/boost/python/object/select_holder.hpp
@@ -22,8 +22,10 @@ namespace detail
   template <class T, class Held>
   struct select_value_holder
   {
+      BOOST_STATIC_CONSTANT(bool, selector = (!is_same<T,Held>::value) | has_back_reference<T>::value);
+  
       typedef typename mpl::select_type<
-          (!is_same<T,Held>::value) | has_back_reference<T>::value
+          selector
           , value_holder_back_reference<T,Held>
           , value_holder<T>
       >::type holder;
@@ -35,9 +37,10 @@ namespace detail
   struct select_pointer_holder
   {
       typedef typename python::detail::pointee<Ptr>::type pointee;
+      BOOST_STATIC_CONSTANT(bool, selector = (!is_same<T,pointee>::value) | has_back_reference<T>::value);
       
       typedef typename mpl::select_type<
-          (!is_same<pointee,T>::value) | has_back_reference<T>::value
+          selector
           , pointer_holder_back_reference<Ptr,T>
           , pointer_holder<Ptr,T>
       >::type holder;