Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7629e7f authored by Dominik Laskowski's avatar Dominik Laskowski
Browse files

FTL: Silence __VA_ARGS__ warning with empty arg 

Bug: 185536303
Test: ftl_test
Change-Id: I3fc52c3dc3904ace7822200ca6c0f9ac39df8fe2
parent 70e45912

include/ftl/fake_guard.h

+1 −2
Original line number Diff line number Diff line
@@ -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__)

include/ftl/small_vector.h

+9 −10
Original line number Diff line number Diff line
@@ -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