Skip to content

Commit c9b4fb4

Browse files
committed
Removed flotsam
[SVN r13653]
1 parent 2151bf8 commit c9b4fb4

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

include/boost/python/object/select_holder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
# include <boost/python/has_back_reference.hpp>
1010
# include <boost/python/detail/not_specified.hpp>
1111
# include <boost/python/detail/pointee.hpp>
12-
# include <boost/python/detail/if_else.hpp>
1312
# include <boost/python/object/value_holder.hpp>
1413
# include <boost/python/object/pointer_holder.hpp>
1514
# include <boost/type.hpp>
1615
# include <boost/mpl/select_type.hpp>
16+
# include <boost/type_traits/same_traits.hpp>
1717

1818
namespace boost { namespace python { namespace objects {
1919

test/if_else.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
template <unsigned size>
1616
struct choose
1717
{
18-
#if 1
1918
typedef typename boost::python::detail::if_<
2019
(sizeof(c1) == size)
2120
>::template then<
@@ -33,21 +32,6 @@ struct choose
3332
>::template then<
3433
c4
3534
>::template else_<void*>::type type;
36-
#else
37-
typedef typename boost::python::detail::if_<
38-
(sizeof(c1) == size)
39-
, c1
40-
>::template elif<
41-
(sizeof(c2) == size)
42-
, c2
43-
>::template elif<
44-
(sizeof(c3) == size)
45-
, c3
46-
>::template elif<
47-
(sizeof(c4) == size)
48-
, c4
49-
>::template else_<void*>::type type;
50-
#endif
5135
};
5236

5337
int main()

0 commit comments

Comments
 (0)