Workaround for vc7 bug (and regression test)

dabrahams · dabrahams · commit d028a60cc215 · 2003-03-03T17:21:30.000Z
[SVN r17708]
diff --git a/include/boost/python/detail/is_xxx.hpp b/include/boost/python/detail/is_xxx.hpp
@@ -12,6 +12,7 @@
 
 # if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 # include <boost/type_traits/is_reference.hpp>
+# include <boost/type_traits/add_reference.hpp>
 
 #  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs)      \
 template <class X_>                                                 \
@@ -20,7 +21,7 @@ struct is_##name                                                    \
     typedef char yes;                                               \
     typedef char (&no)[2];                                          \
                                                                     \
-    static X_ dummy;                                                \
+    static typename add_reference<X_>::type dummy;                  \
                                                                     \
     template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class U) >          \
     static yes test(                                                \
diff --git a/test/implicit.cpp b/test/implicit.cpp
@@ -20,8 +20,18 @@ int x_value(X const& x)
 
 X make_x(int n) { return X(n); }
 
+
+// foo/bar -- a regression for a vc7 bug workaround
+struct bar {};
+struct foo
+{
+    virtual void f() = 0;
+    operator bar() const { return bar(); }
+};
+
 BOOST_PYTHON_MODULE(implicit_ext)
 {
+    implicitly_convertible<foo,bar>();
     implicitly_convertible<int,X>();
     
     def("x_value", x_value);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)`
`14`	`14`	`# include <boost/type_traits/is_reference.hpp>`
	`15`	`+# include <boost/type_traits/add_reference.hpp>`
`15`	`16`
`16`	`17`	`# define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs) \`
`17`	`18`	`template <class X_> \`
`@@ -20,7 +21,7 @@ struct is_##name \`
`20`	`21`	`typedef char yes; \`
`21`	`22`	`typedef char (&no)[2]; \`
`22`	`23`	`\`
`23`		`- static X_ dummy; \`
	`24`	`+ static typename add_reference<X_>::type dummy; \`
`24`	`25`	`\`
`25`	`26`	`template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class U) > \`
`26`	`27`	`static yes test( \`