diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-23 16:46:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-23 16:46:34 +0100 |
| commit | 31c4ac62dba8f8312ae094def9dfae4cd3fdc05a (patch) | |
| tree | 756df37a6a7bbb91f78bbbb5865d01a13e824bd9 /boost | |
| parent | e7ffa3e2d36a800bf2f2d91ca6d08887a21caa31 (diff) | |
ah, dos format breaks some patches
Change-Id: Id99429366485924ff35da63ebde1b5df11419d58
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost.4127.warnings.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch index b3e355dd3b9b..fe3c2bf51e95 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; + } + } |