ah, dos format breaks some patches

Change-Id: Id99429366485924ff35da63ebde1b5df11419d58
2012-07-23 16:46:34 +01:00 · 2012-07-23 16:46:34 +01:00 · 31c4ac62db
commit 31c4ac62db
parent e7ffa3e2d3
1 changed files with 21 additions and 21 deletions
--- 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/boost_1_44_0/boost/smart_ptr/make_shared.hpp
-+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp	(revision 69251)
+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp
-@@ -49,7 +49,18 @@
+@@ -49,7 +49,18 @@
-     {
+     {
-         if( initialized_ )
+         if( initialized_ )
-         {
+         {
-+#if defined( __GNUC__ )
+#if defined( __GNUC__ )
-+
+
-+            // fixes incorrect aliasing warning
+            // fixes incorrect aliasing warning
-+            T * p = reinterpret_cast< T* >( storage_.data_ );
+            T * p = reinterpret_cast< T* >( storage_.data_ );
-+            p->~T();
+            p->~T();
-+
+
-+#else
+#else
-+
+
-             reinterpret_cast< T* >( storage_.data_ )->~T();
+             reinterpret_cast< T* >( storage_.data_ )->~T();
-+
+
-+#endif
+#endif
-+
+
-             initialized_ = false;
+             initialized_ = false;
-         }
+         }
-     }
+     }