diff options
| -rw-r--r-- | include/ftl/fake_guard.h | 3 | ||||
| -rw-r--r-- | include/ftl/small_vector.h | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/include/ftl/fake_guard.h b/include/ftl/fake_guard.h index bacd1b29ef..e6012516fc 100644 --- a/include/ftl/fake_guard.h +++ b/include/ftl/fake_guard.h @@ -85,6 +85,5 @@ struct [[clang::scoped_lockable]] FakeGuard final { #define FTL_MAKE_FAKE_GUARD(arg1, arg2, guard, ...) guard -// The void argument suppresses a warning about zero variadic macro arguments. #define FTL_FAKE_GUARD(...) \ - FTL_MAKE_FAKE_GUARD(__VA_ARGS__, FTL_FAKE_GUARD2, FTL_FAKE_GUARD1, void)(__VA_ARGS__) + FTL_MAKE_FAKE_GUARD(__VA_ARGS__, FTL_FAKE_GUARD2, FTL_FAKE_GUARD1, )(__VA_ARGS__) diff --git a/include/ftl/small_vector.h b/include/ftl/small_vector.h index 11294c3ac8..43e9fac5e2 100644 --- a/include/ftl/small_vector.h +++ b/include/ftl/small_vector.h @@ -124,30 +124,29 @@ class SmallVector final : details::ArrayTraits<T>, details::ArrayComparators<Sma DISPATCH(size_type, size, const) DISPATCH(bool, empty, const) - // noexcept to suppress warning about zero variadic macro arguments. - DISPATCH(iterator, begin, noexcept) + DISPATCH(iterator, begin, ) DISPATCH(const_iterator, begin, const) DISPATCH(const_iterator, cbegin, const) - DISPATCH(iterator, end, noexcept) + DISPATCH(iterator, end, ) DISPATCH(const_iterator, end, const) DISPATCH(const_iterator, cend, const) - DISPATCH(reverse_iterator, rbegin, noexcept) + DISPATCH(reverse_iterator, rbegin, ) DISPATCH(const_reverse_iterator, rbegin, const) DISPATCH(const_reverse_iterator, crbegin, const) - DISPATCH(reverse_iterator, rend, noexcept) + DISPATCH(reverse_iterator, rend, ) DISPATCH(const_reverse_iterator, rend, const) DISPATCH(const_reverse_iterator, crend, const) - DISPATCH(iterator, last, noexcept) + DISPATCH(iterator, last, ) DISPATCH(const_iterator, last, const) - DISPATCH(reference, front, noexcept) + DISPATCH(reference, front, ) DISPATCH(const_reference, front, const) - DISPATCH(reference, back, noexcept) + DISPATCH(reference, back, ) DISPATCH(const_reference, back, const) reference operator[](size_type i) { @@ -211,13 +210,13 @@ class SmallVector final : details::ArrayTraits<T>, details::ArrayComparators<Sma // // The last() and end() iterators are invalidated. // - DISPATCH(void, pop_back, noexcept) + DISPATCH(void, pop_back, ) // Removes all elements. // // All iterators are invalidated. // - DISPATCH(void, clear, noexcept) + DISPATCH(void, clear, ) #undef DISPATCH |