[Libreoffice-commits] .: boost/boost.4127.warnings.patch

[Caolán McNamara]

 boost/boost.4127.warnings.patch |   42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 31c4ac62dba8f8312ae094def9dfae4cd3fdc05a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 23 16:46:34 2012 +0100

    ah, dos format breaks some patches
    
    Change-Id: Id99429366485924ff35da63ebde1b5df11419d58

diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
index b3e355d..fe3c2bf 100644
--- a/boost/boost.4127.warnings.patch
+++ b/boost/boost.4127.warnings.patch
@@ -1,21 +1,21 @@
---- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp	(revision 69250)
-+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp	(revision 69251)
-@@ -49,7 +49,18 @@
-     {
-         if( initialized_ )
-         {
-+#if defined( __GNUC__ )
-+
-+            // fixes incorrect aliasing warning
-+            T * p = reinterpret_cast< T* >( storage_.data_ );
-+            p->~T();
-+
-+#else
-+
-             reinterpret_cast< T* >( storage_.data_ )->~T();
-+
-+#endif
-+
-             initialized_ = false;
-         }
-     }
+--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp
++++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp
+@@ -49,7 +49,18 @@
+     {
+         if( initialized_ )
+         {
++#if defined( __GNUC__ )
++
++            // fixes incorrect aliasing warning
++            T * p = reinterpret_cast< T* >( storage_.data_ );
++            p->~T();
++
++#else
++
+             reinterpret_cast< T* >( storage_.data_ )->~T();
++
++#endif
++
+             initialized_ = false;
+         }
+     }