From: Simon Marchi <simon.marchi@efficios.com>
Date: Wed, 29 May 2024 15:50:31 +0000 (-0400)
Subject: cpp-common/bt2c/data-len.hpp: `static inline` → `inline`
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1da961a6874731c277458f87e78670419d846e9a;p=babeltrace.git

cpp-common/bt2c/data-len.hpp: `static inline` → `inline`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I8f6a6d49d24ad312c2fdead6667bc41494f1321d
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12766
---

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));
 }