From 1da961a6874731c277458f87e78670419d846e9a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 29 May 2024 11:50:31 -0400 Subject: [PATCH] =?utf8?q?cpp-common/bt2c/data-len.hpp:=20`static=20inline?= =?utf8?q?`=20=E2=86=92=20`inline`?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Change-Id: I8f6a6d49d24ad312c2fdead6667bc41494f1321d Reviewed-on: https://review.lttng.org/c/babeltrace/+/12766 --- src/cpp-common/bt2c/data-len.hpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/cpp-common/bt2c/data-len.hpp b/src/cpp-common/bt2c/data-len.hpp index 72167e08..4a533055 100644 --- a/src/cpp-common/bt2c/data-len.hpp +++ b/src/cpp-common/bt2c/data-len.hpp @@ -150,17 +150,17 @@ private: unsigned long long _mLenBits = 0; }; -static inline DataLen operator+(const DataLen lenA, const DataLen lenB) noexcept +inline DataLen operator+(const DataLen lenA, const DataLen lenB) noexcept { return DataLen::fromBits(safeAdd(*lenA, *lenB)); } -static inline DataLen operator-(const DataLen lenA, const DataLen lenB) noexcept +inline DataLen operator-(const DataLen lenA, const DataLen lenB) noexcept { return DataLen::fromBits(safeSub(*lenA, *lenB)); } -static inline DataLen operator*(const DataLen len, const unsigned long long mul) noexcept +inline DataLen operator*(const DataLen len, const unsigned long long mul) noexcept { return DataLen::fromBits(safeMul(*len, mul)); } @@ -176,44 +176,42 @@ static inline DataLen operator*(const DataLen len, const unsigned long long mul) namespace literals { namespace datalen { -/* The spaces between `operator""` and the suffixes is to please g++ 4.8. */ - -static inline DataLen operator"" _bits(const unsigned long long val) noexcept +inline DataLen operator"" _bits(const unsigned long long val) noexcept { return DataLen::fromBits(val); } -static inline DataLen operator"" _KiBits(const unsigned long long val) noexcept +inline DataLen operator"" _KiBits(const unsigned long long val) noexcept { return DataLen::fromBits(safeMul(val, 1024ULL)); } -static inline DataLen operator"" _MiBits(const unsigned long long val) noexcept +inline DataLen operator"" _MiBits(const unsigned long long val) noexcept { return DataLen::fromBits(safeMul(val, 1024ULL * 1024)); } -static inline DataLen operator"" _GiBits(const unsigned long long val) noexcept +inline DataLen operator"" _GiBits(const unsigned long long val) noexcept { return DataLen::fromBits(safeMul(val, 1024ULL * 1024 * 1024)); } -static inline DataLen operator"" _bytes(const unsigned long long val) noexcept +inline DataLen operator"" _bytes(const unsigned long long val) noexcept { return DataLen::fromBytes(val); } -static inline DataLen operator"" _KiBytes(const unsigned long long val) noexcept +inline DataLen operator"" _KiBytes(const unsigned long long val) noexcept { return DataLen::fromBytes(safeMul(val, 1024ULL)); } -static inline DataLen operator"" _MiBytes(const unsigned long long val) noexcept +inline DataLen operator"" _MiBytes(const unsigned long long val) noexcept { return DataLen::fromBytes(safeMul(val, 1024ULL * 1024)); } -static inline DataLen operator"" _GiBytes(const unsigned long long val) noexcept +inline DataLen operator"" _GiBytes(const unsigned long long val) noexcept { return DataLen::fromBytes(safeMul(val, 1024ULL * 1024 * 1024)); } -- 2.34.1