Skip to content

C
core
Kaydet (Commit) 31c4ac62 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

ah, dos format breaks some patches 

Change-Id: Id99429366485924ff35da63ebde1b5df11419d58
üst e7ffa3e2
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
boost/boost.4127.warnings.patch
Dosyayı görüntüle @ 31c4ac62
--- 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;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment