From d5aaa3801aa40c83b14ce980c077da79a8ced578 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 6 Apr 2015 12:48:06 +0300 Subject: [PATCH] Revert "fix a couple of gcc warnings" This reverts commit 79e73a715c0a323404cdc5f29e2f25dd573473b7. --- include/boost/archive/iterators/transform_width.hpp | 3 +-- include/boost/serialization/variant.hpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/archive/iterators/transform_width.hpp b/include/boost/archive/iterators/transform_width.hpp index 1c304c04..15dd8dfc 100644 --- a/include/boost/archive/iterators/transform_width.hpp +++ b/include/boost/archive/iterators/transform_width.hpp @@ -113,11 +113,10 @@ public: transform_width(BOOST_PFTO_WRAPPER(T) start) : super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))), m_buffer_out_full(false), - m_buffer_out(), // To disable GCC warning, but not truly necessary //(m_buffer_in will be initialized later before being //used because m_remaining_bits == 0) - m_buffer_in(), + m_buffer_in(0), m_remaining_bits(0), m_end_of_sequence(false) {} diff --git a/include/boost/serialization/variant.hpp b/include/boost/serialization/variant.hpp index dce6f3d4..70e395e2 100644 --- a/include/boost/serialization/variant.hpp +++ b/include/boost/serialization/variant.hpp @@ -66,6 +66,7 @@ void save( ){ int which = v.which(); ar << BOOST_SERIALIZATION_NVP(which); + typedef typename boost::variant::types types; variant_save_visitor visitor(ar); v.apply_visitor(visitor); }