From c9b4fb418ad3e384de8e314f6eac2dc679ad55d8 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 3 May 2002 21:20:12 +0000
Subject: [PATCH] Removed flotsam

[SVN r13653]
---
 include/boost/python/object/select_holder.hpp |  2 +-
 test/if_else.cpp                              | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/include/boost/python/object/select_holder.hpp b/include/boost/python/object/select_holder.hpp
index 72446358..95330d10 100644
--- a/include/boost/python/object/select_holder.hpp
+++ b/include/boost/python/object/select_holder.hpp
@@ -9,11 +9,11 @@
 # include <boost/python/has_back_reference.hpp>
 # include <boost/python/detail/not_specified.hpp>
 # include <boost/python/detail/pointee.hpp>
-# include <boost/python/detail/if_else.hpp>
 # include <boost/python/object/value_holder.hpp>
 # include <boost/python/object/pointer_holder.hpp>
 # include <boost/type.hpp>
 # include <boost/mpl/select_type.hpp>
+# include <boost/type_traits/same_traits.hpp>
 
 namespace boost { namespace python { namespace objects {
 
diff --git a/test/if_else.cpp b/test/if_else.cpp
index d8bd34ca..e2b50f28 100644
--- a/test/if_else.cpp
+++ b/test/if_else.cpp
@@ -15,7 +15,6 @@
 template <unsigned size>
 struct choose
 {
-#if 1
     typedef typename boost::python::detail::if_<
         (sizeof(c1) == size)
     >::template then<
@@ -33,21 +32,6 @@ struct choose
     >::template then<
         c4
     >::template else_<void*>::type type;
-#else
-    typedef typename boost::python::detail::if_<
-        (sizeof(c1) == size)
-        , c1
-    >::template elif<
-        (sizeof(c2) == size)
-        , c2
-    >::template elif<
-        (sizeof(c3) == size)
-        , c3
-    >::template elif<
-        (sizeof(c4) == size)
-        , c4
-    >::template else_<void*>::type type;
-#endif 
 };
 
 int main()