From b4ad7ee1bd92cb4edb13eea236c6332607f547c0 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Sun, 26 Jan 2025 17:29:28 +0100 Subject: [PATCH] Remove deprecated space between literal operator quotes and suffix. See CWG2521 for rationale. --- vespalib/src/vespa/vespalib/util/size_literals.h | 8 ++++---- vespalib/src/vespa/vespalib/util/static_string.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vespalib/src/vespa/vespalib/util/size_literals.h b/vespalib/src/vespa/vespalib/util/size_literals.h index a1f4e23871ae..38e9572679ff 100644 --- a/vespalib/src/vespa/vespalib/util/size_literals.h +++ b/vespalib/src/vespa/vespalib/util/size_literals.h @@ -4,18 +4,18 @@ #include -constexpr size_t operator "" _Ki(unsigned long long k_in) { +constexpr size_t operator ""_Ki(unsigned long long k_in) { return size_t(k_in << 10u); } -constexpr size_t operator "" _Mi(unsigned long long m_in) { +constexpr size_t operator ""_Mi(unsigned long long m_in) { return size_t(m_in << 20u); } -constexpr size_t operator "" _Gi(unsigned long long g_in) { +constexpr size_t operator ""_Gi(unsigned long long g_in) { return size_t(g_in << 30u); } -constexpr size_t operator "" _Ti(unsigned long long t_in) { +constexpr size_t operator ""_Ti(unsigned long long t_in) { return size_t(t_in << 40u); } diff --git a/vespalib/src/vespa/vespalib/util/static_string.h b/vespalib/src/vespa/vespalib/util/static_string.h index 582b9462ad50..2cd74f985a46 100644 --- a/vespalib/src/vespa/vespalib/util/static_string.h +++ b/vespalib/src/vespa/vespalib/util/static_string.h @@ -9,7 +9,7 @@ namespace vespalib { class StaticStringView; namespace literals { -constexpr StaticStringView operator "" _ssv(const char *literal, size_t size); +constexpr StaticStringView operator ""_ssv(const char *literal, size_t size); } // literals /** @@ -18,7 +18,7 @@ constexpr StaticStringView operator "" _ssv(const char *literal, size_t size); class StaticStringView { private: std::string_view _view; - friend constexpr StaticStringView literals::operator "" _ssv(const char *, size_t); + friend constexpr StaticStringView literals::operator ""_ssv(const char *, size_t); constexpr StaticStringView(const char *literal, size_t size) noexcept : _view(literal, size) {} public: @@ -28,7 +28,7 @@ class StaticStringView { }; namespace literals { -constexpr StaticStringView operator "" _ssv(const char *literal, size_t size) { +constexpr StaticStringView operator ""_ssv(const char *literal, size_t size) { return {literal, size}; } } // literals