]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid warnings in bundled muparser and boost
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 11 Aug 2017 03:57:12 +0000 (05:57 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Sat, 12 Aug 2017 20:41:11 +0000 (22:41 +0200)
bundled/boost-1.62.0/include/boost/archive/iterators/transform_width.hpp
bundled/boost-1.62.0/include/boost/signals2/detail/auto_buffer.hpp
bundled/muparser_v2_2_4/CMakeLists.txt

index d042560e29129e2d0d24ef7902b6478ae27d925b..cd1dbd22648f44def36d45f7d17e3bf26a6ab8cd 100644 (file)
@@ -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<
index 0970d3da9011091886091969869ef1c28cdb2655..4059925c776a46b312ed94d570d0c3542b904740 100644 (file)
@@ -304,6 +304,7 @@ namespace detail
             (*this).~auto_buffer();
             buffer_   = new_buffer;
             members_.capacity_ = new_capacity;
+            size_ = std::max(static_cast<decltype(size_)>(0),size_);
             BOOST_ASSERT( size_ <= members_.capacity_ );
         }
 
index 196ea1716425ffc1bd894d961e3f2b014c5f9540..87606eb3878b81a7e7c341e69bc5b0aa58cf81b5 100644 (file)
@@ -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/

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.