X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=boost-1.54.0-mpl-print.patch;h=cbd1493fab8a995f411965cd6aa531465603490a;hb=d87aeeca87c7d781188f660a0d7ee48a2fe57743;hp=6c27b148f8052581eecdc30a6566ec154ea74b1a;hpb=647f39b293bde17ba3cf3a5d5ff661a6acff71fd;p=packages%2Fboost.git

diff --git a/boost-1.54.0-mpl-print.patch b/boost-1.54.0-mpl-print.patch
index 6c27b14..cbd1493 100644
--- a/boost-1.54.0-mpl-print.patch
+++ b/boost-1.54.0-mpl-print.patch
@@ -2,18 +2,26 @@ Index: boost/mpl/print.hpp
 ===================================================================
 --- boost/mpl/print.hpp	(revision 83411)
 +++ boost/mpl/print.hpp	(working copy)
-@@ -45,22 +45,21 @@
+@@ -44,7 +44,7 @@
      : mpl::identity<T>
  #if defined(__MWERKS__)
      , aux::print_base
 -#endif 
 +#endif
  {
- #if defined(BOOST_MSVC)
+ #if defined(__clang__)
+     const int m_x = 1 / (sizeof(T) - sizeof(T));
+@@ -52,15 +52,14 @@
      enum { n = sizeof(T) + -1 };
  #elif defined(__MWERKS__)
      void f(int);
--#else 
++#elif defined(__EDG_VERSION__)
++    enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++    enum { n1 };
++    enum { n2 };
++    enum { n = n1 != n2 };
+ #else 
 -    enum {
 -        n =
 -# if defined(__EDG_VERSION__)
@@ -22,16 +30,7 @@ Index: boost/mpl/print.hpp
 -           sizeof(T) > -1
 -# endif 
 -        };
--#endif 
-+#elif defined(__EDG_VERSION__)
-+    enum { n = aux::dependent_unsigned<T>::value > -1 };
-+#elif defined(BOOST_GCC)
-+    enum { n1 };
-+    enum { n2 };
-+    enum { n = n1 != n2 };
-+#else
 +    enum { n = sizeof(T) > -1 };
-+#endif
+ #endif 
  };
  
- #if defined(BOOST_MSVC)