From 2f8c075a0111f496269fdb6d67c9d40fcb461c6a Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 23 Jan 2018 18:05:04 +0100 Subject: [PATCH] Utils: Make default constructor of SmallString constexpr Change-Id: Ibf381c9f18de878b1f67e28498cd28270e9220c7 Reviewed-by: Ivan Donchevskii --- src/libs/utils/smallstring.h | 2 +- src/libs/utils/smallstringlayout.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index f7bc78f3040..b050d3f6f19 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -69,7 +69,7 @@ public: ? sizeof(Internal::StringDataLayout) == Size + 1 : sizeof(Internal::StringDataLayout) == Size + 2, "Size is wrong"); - + constexpr BasicSmallString() noexcept : m_data(Internal::StringDataLayout()) { diff --git a/src/libs/utils/smallstringlayout.h b/src/libs/utils/smallstringlayout.h index fc39922b63c..3a93fe8805a 100644 --- a/src/libs/utils/smallstringlayout.h +++ b/src/libs/utils/smallstringlayout.h @@ -98,7 +98,7 @@ struct ALIGNAS_16 StringDataLayout { : ((MaximumShortStringDataAreaSize + 2) % 16) == 0, "Size + 1 must be dividable by 16 if under 64 and Size + 2 must be dividable by 16 if over 64!"); - StringDataLayout() noexcept = default; + constexpr StringDataLayout() noexcept = default; constexpr StringDataLayout(const char *string, size_type size) noexcept