reinstate workarounds for vc7

dabrahams · dabrahams · commit ff0980914bc1 · 2003-05-22T01:34:04.000Z
[SVN r18490]
diff --git a/include/boost/python/detail/destroy.hpp b/include/boost/python/detail/destroy.hpp
@@ -7,13 +7,26 @@
 # define DESTROY_DWA2002221_HPP
 
 # include <boost/type_traits/is_array.hpp>
-
+# include <boost/detail/workaround.hpp>
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+#  include <boost/type_traits/is_enum.hpp>
+# endif 
 namespace boost { namespace python { namespace detail { 
 
-template <bool array> struct value_destroyer;
+template <
+    bool array
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+  , bool enum_  // vc7 has a problem destroying enums
+# endif 
+    > struct value_destroyer;
     
 template <>
-struct value_destroyer<false>
+struct value_destroyer<
+    false
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+  , false
+# endif 
+    >
 {
     template <class T>
     static void execute(T const volatile* p)
@@ -23,7 +36,12 @@ struct value_destroyer<false>
 };
 
 template <>
-struct value_destroyer<true>
+struct value_destroyer<
+    true
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+  , false
+# endif 
+    >
 {
     template <class A, class T>
     static void execute(A*, T const volatile* const first)
@@ -32,6 +50,9 @@ struct value_destroyer<true>
         {
             value_destroyer<
                 boost::is_array<T>::value
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+              , boost::is_enum<T>::value
+# endif 
             >::execute(p);
         }
     }
@@ -43,13 +64,35 @@ struct value_destroyer<true>
     }
 };
 
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+template <>
+struct value_destroyer<true,true>
+{
+    template <class T>
+    static void execute(T const volatile*)
+    {
+    }
+};
+
+template <>
+struct value_destroyer<false,true>
+{
+    template <class T>
+    static void execute(T const volatile*)
+    {
+    }
+};
+# endif 
 template <class T>
 inline void destroy_referent_impl(void* p, T& (*)())
 {
     // note: cv-qualification needed for MSVC6
     // must come *before* T for metrowerks
     value_destroyer<
          (boost::is_array<T>::value)
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+       , (boost::is_enum<T>::value)
+# endif 
     >::execute((const volatile T*)p);
 }
 
