From 92bb4b697575980fcbb84b8c4f52c366a6aa0171 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 11 Aug 2017 05:57:12 +0200 Subject: [PATCH] Avoid warnings in bundled muparser and boost --- .../include/boost/archive/iterators/transform_width.hpp | 9 --------- .../include/boost/signals2/detail/auto_buffer.hpp | 1 + bundled/muparser_v2_2_4/CMakeLists.txt | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bundled/boost-1.62.0/include/boost/archive/iterators/transform_width.hpp b/bundled/boost-1.62.0/include/boost/archive/iterators/transform_width.hpp index d042560e29..cd1dbd2264 100644 --- a/bundled/boost-1.62.0/include/boost/archive/iterators/transform_width.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/iterators/transform_width.hpp @@ -118,15 +118,6 @@ public: m_remaining_bits(0), m_end_of_sequence(false) {} - // intel 7.1 doesn't like default copy constructor - transform_width(const transform_width & rhs) : - super_t(rhs.base_reference()), - m_buffer_out_full(rhs.m_buffer_out_full), - m_buffer_out(rhs.m_buffer_out), - m_buffer_in(rhs.m_buffer_in), - m_remaining_bits(rhs.m_remaining_bits), - m_end_of_sequence(false) - {} }; template< diff --git a/bundled/boost-1.62.0/include/boost/signals2/detail/auto_buffer.hpp b/bundled/boost-1.62.0/include/boost/signals2/detail/auto_buffer.hpp index 0970d3da90..4059925c77 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/detail/auto_buffer.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/detail/auto_buffer.hpp @@ -304,6 +304,7 @@ namespace detail (*this).~auto_buffer(); buffer_ = new_buffer; members_.capacity_ = new_capacity; + size_ = std::max(static_cast(0),size_); BOOST_ASSERT( size_ <= members_.capacity_ ); } diff --git a/bundled/muparser_v2_2_4/CMakeLists.txt b/bundled/muparser_v2_2_4/CMakeLists.txt index 196ea17164..87606eb387 100644 --- a/bundled/muparser_v2_2_4/CMakeLists.txt +++ b/bundled/muparser_v2_2_4/CMakeLists.txt @@ -20,6 +20,7 @@ STRIP_FLAG(DEAL_II_CXX_FLAGS "-Wall") STRIP_FLAG(DEAL_II_CXX_FLAGS "-pedantic") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS -Wno-switch) ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS -Wno-nested-anon-types) +ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS -Wno-implicit-fallthrough) INCLUDE_DIRECTORIES( include/ -- 2.39.5