From fded8150218ab3b96b86216f6bfd4a7a50ff8ec0 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 12 May 2020 12:52:22 +0200 Subject: [PATCH] Utils: Use always std::strlen std::strlen is computed at compile time if possible by the compiler. So we don't need this optimization. Change-Id: I31112219df9a3b42fe9d57cdd981f869e6f02dae Reviewed-by: Tim Jenssen --- src/libs/utils/smallstringview.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/libs/utils/smallstringview.h b/src/libs/utils/smallstringview.h index 911ba2eafd4..6bdb1c6395a 100644 --- a/src/libs/utils/smallstringview.h +++ b/src/libs/utils/smallstringview.h @@ -53,23 +53,10 @@ public: constexpr SmallStringView() = default; - template - constexpr - SmallStringView(const char(&string)[Size]) noexcept - : m_pointer(string), - m_size(Size - 1) + SmallStringView(const char *characterPointer) noexcept + : m_pointer(characterPointer) + , m_size(std::strlen(characterPointer)) { - static_assert(Size >= 1, "Invalid string literal! Length is zero!"); - } - - template::value> - > - SmallStringView(Type characterPointer) noexcept - : m_pointer(characterPointer), - m_size(std::strlen(characterPointer)) - { - static_assert(!std::is_array::value, "Input type is array and not char pointer!"); } constexpr