From 428dc1319a515f7a1eab781cf013106dbe5ee786 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Mon, 6 Dec 2021 15:48:24 +0100 Subject: [PATCH] Warning fixes Signed-off-by: Alexander Borsuk --- 3party/opening_hours/opening_hours.cpp | 2 +- 3party/opening_hours/opening_hours.hpp | 6 +++--- coding/endianness.hpp | 2 +- indexer/feature_impl.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3party/opening_hours/opening_hours.cpp b/3party/opening_hours/opening_hours.cpp index e51dde1d66..7dd39dd30c 100644 --- a/3party/opening_hours/opening_hours.cpp +++ b/3party/opening_hours/opening_hours.cpp @@ -424,7 +424,7 @@ bool WeekdayRange::operator==(WeekdayRange const & rhs) const m_nths == rhs.m_nths; } -std::ostream & operator<<(std::ostream & ost, Weekday const wday) +std::ostream & operator<<(std::ostream & ost, Weekday wday) { switch (wday) { diff --git a/3party/opening_hours/opening_hours.hpp b/3party/opening_hours/opening_hours.hpp index 3ece11e375..321a669a0f 100644 --- a/3party/opening_hours/opening_hours.hpp +++ b/3party/opening_hours/opening_hours.hpp @@ -296,7 +296,7 @@ enum class Weekday Saturday }; -inline constexpr Weekday ToWeekday(uint64_t const day) +inline constexpr Weekday ToWeekday(uint64_t day) { using TDay = decltype(day); return ((day <= static_cast(Weekday::None) || @@ -310,7 +310,7 @@ inline constexpr Weekday operator ""_weekday(unsigned long long int day) return ToWeekday(day); } -std::ostream & operator<<(std::ostream & ost, Weekday const wday); +std::ostream & operator<<(std::ostream & ost, Weekday wday); class WeekdayRange { @@ -497,7 +497,7 @@ private: DateOffset m_offset; }; -inline constexpr MonthDay::Month ToMonth(uint64_t const month) +inline constexpr MonthDay::Month ToMonth(uint64_t month) { using TMonth = decltype(month); return ((month <= static_cast(MonthDay::Month::None) || diff --git a/coding/endianness.hpp b/coding/endianness.hpp index 21d8fc809d..df5412bc25 100644 --- a/coding/endianness.hpp +++ b/coding/endianness.hpp @@ -49,6 +49,6 @@ T SwapIfBigEndianMacroBased(T t) inline bool IsLittleEndian() { uint16_t const word = 0x0001; - uint8_t const * const b = reinterpret_cast(&word); + uint8_t const * b = reinterpret_cast(&word); return b[0] != 0x0; } diff --git a/indexer/feature_impl.hpp b/indexer/feature_impl.hpp index a4c0fbd556..6ff167d0aa 100644 --- a/indexer/feature_impl.hpp +++ b/indexer/feature_impl.hpp @@ -22,7 +22,7 @@ inline std::string GetTagForIndex(std::string const & prefix, size_t ind) static char const arrChar[] = {'0', '1', '2', '3'}; static_assert(ARRAY_SIZE(arrChar) >= ARRAY_SIZE(g_arrWorldScales), ""); static_assert(ARRAY_SIZE(arrChar) >= ARRAY_SIZE(g_arrCountryScales), ""); - ASSERT(ind >= 0 && ind < ARRAY_SIZE(arrChar), (ind)); + ASSERT(ind < ARRAY_SIZE(arrChar), (ind)); return prefix + arrChar[ind]; }