Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ project
$(c11-requires)
<define>BOOST_URL_SOURCE
<toolset>msvc-14.0:<build>no
# Warnings in dependencies
<toolset>gcc:<cxxflags>"-Wno-maybe-uninitialized"
<toolset>gcc,<target-os>windows:<cxxflags>"-Wno-error=array-bounds"
: common-requirements
<link>shared:<define>BOOST_URL_DYN_LINK=1
Expand Down
7 changes: 0 additions & 7 deletions include/boost/url/detail/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,6 @@
#define BOOST_URL_MAX_SIZE ((std::size_t)UINT32_MAX - 1)
#endif

// noinline attribute
#ifdef BOOST_GCC
#define BOOST_URL_NO_INLINE [[gnu::noinline]]
#else
#define BOOST_URL_NO_INLINE
#endif

// libstdcxx copy-on-write strings
#ifndef BOOST_URL_COW_STRINGS
#if defined(BOOST_LIBSTDCXX_VERSION) && (BOOST_LIBSTDCXX_VERSION < 60000 || (defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI == 0))
Expand Down
12 changes: 11 additions & 1 deletion include/boost/url/grammar/impl/tuple_rule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ struct parse_sequence
}
};

// See error_types.hpp for details (#979)
#if defined(BOOST_GCC) && BOOST_GCC >= 70000
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif

// returns a value_type
template<class R0, class... Rn>
struct parse_sequence<false, R0, Rn...>
Expand Down Expand Up @@ -218,7 +224,7 @@ struct parse_sequence<false, R0, Rn...>
system::result<void> rv =
grammar::parse(
it, end, get<Ir>(rn));
if( !rv )
if( rv.has_error() )
{
v = rv.error();
return;
Expand Down Expand Up @@ -273,6 +279,10 @@ struct parse_sequence<false, R0, Rn...>
}
};

#if defined(BOOST_GCC) && BOOST_GCC >= 70000
#pragma GCC diagnostic pop
#endif

} // detail

template<
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ endif()
if (BOOST_URL_WARNINGS_AS_ERRORS)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7)
set(BOOST_URL_TEST_FLAGS "-Wall -Werror -Wno-unused-but-set-variable -Wno-maybe-uninitialized")
set(BOOST_URL_TEST_FLAGS "-Wall -Werror -Wno-unused-but-set-variable")
else()
set(BOOST_URL_TEST_FLAGS "-Wall -Werror -Wno-unused-but-set-variable")
endif()
Expand Down
1 change: 0 additions & 1 deletion test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ project

# Warnings in dependencies
<toolset>gcc:<cxxflags>"-Wno-unused-but-set-variable"
<toolset>gcc:<cxxflags>"-Wno-maybe-uninitialized"
<toolset>gcc-15:<cxxflags>"-Wno-deprecated-declarations"
<toolset>gcc,<target-os>windows:<cxxflags>"-Wno-error=array-bounds"
<toolset>clang:<cxxflags>"-Wno-unused-but-set-variable"
Expand Down
Loading