From 1acbd42eb8a928713b5eedb46d95fa50aa94c9ca Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Fri, 24 Feb 2017 11:48:27 +0000 Subject: [PATCH] de-fuzz: fix 2 more gcc warnings --- include/boost/regex/config.hpp | 2 +- include/boost/regex/icu.hpp | 2 +- include/boost/regex/pending/unicode_iterator.hpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index 87bc085b..589b1e3a 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -152,7 +152,7 @@ # if defined(BOOST_REGEX_NO_W32) || BOOST_PLAT_WINDOWS_RUNTIME # define BOOST_REGEX_NO_FILEITER # endif -#else // defined(_WIN32) +#else /* defined(_WIN32) */ # if !defined(BOOST_HAS_DIRENT_H) # define BOOST_REGEX_NO_FILEITER # endif diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp index a57fe577..8be8e60a 100644 --- a/include/boost/regex/icu.hpp +++ b/include/boost/regex/icu.hpp @@ -410,7 +410,7 @@ void copy_results(MR1& out, MR2 const& in) if(in[i].captures().size()) { out[i].get_captures().assign(in[i].captures().size(), typename MR1::value_type()); - for(int j = 0; j < out[i].captures().size(); ++j) + for(int j = 0; j < (int)out[i].captures().size(); ++j) { out[i].get_captures()[j].first = in[i].captures()[j].first.base(); out[i].get_captures()[j].second = in[i].captures()[j].second.base(); diff --git a/include/boost/regex/pending/unicode_iterator.hpp b/include/boost/regex/pending/unicode_iterator.hpp index 04af4260..becb17ad 100644 --- a/include/boost/regex/pending/unicode_iterator.hpp +++ b/include/boost/regex/pending/unicode_iterator.hpp @@ -117,7 +117,10 @@ inline unsigned utf8_trailing_byte_count(boost::uint8_t c) #pragma warning(push) #pragma warning(disable:4100) #endif -BOOST_NORETURN inline void invalid_utf32_code_point(::boost::uint32_t val) +#ifndef BOOST_NO_EXCEPTIONS +BOOST_NORETURN +#endif +inline void invalid_utf32_code_point(::boost::uint32_t val) { #ifndef BOOST_NO_STD_LOCALE std::stringstream ss;