From 540d4ec12be9b320cd5a42b93accd343764bf6b8 Mon Sep 17 00:00:00 2001
From: Ronen Friedman <rfriedma@redhat.com>
Date: Sun, 2 Jul 2023 12:24:47 -0500
Subject: [PATCH] common: make some common ctors and accessors constexpr

Add the constexpr qualifier to:
- some utime_t ctors and accessors;
- a shard_id_t ctor;
- ceph_le operator

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---
 src/include/byteorder.h |  2 +-
 src/include/types.h     |  2 +-
 src/include/utime.h     | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/include/byteorder.h b/src/include/byteorder.h
index eb6d5e102b485..25b06db982da7 100644
--- a/src/include/byteorder.h
+++ b/src/include/byteorder.h
@@ -24,7 +24,7 @@ public:
     v = boost::endian::native_to_little(nv);
     return *this;
   }
-  operator T() const { return boost::endian::little_to_native(v); }
+  constexpr operator T() const { return boost::endian::little_to_native(v); }
   friend inline bool operator==(ceph_le a, ceph_le b) {
     return a.v == b.v;
   }
diff --git a/src/include/types.h b/src/include/types.h
index a76360db4035a..bdd09a53df10f 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -503,7 +503,7 @@ struct shard_id_t {
   int8_t id;
 
   shard_id_t() : id(0) {}
-  explicit shard_id_t(int8_t _id) : id(_id) {}
+  constexpr explicit shard_id_t(int8_t _id) : id(_id) {}
 
   operator int8_t() const { return id; }
 
diff --git a/src/include/utime.h b/src/include/utime.h
index fad66af7939ad..ff8df7e5508f2 100644
--- a/src/include/utime.h
+++ b/src/include/utime.h
@@ -56,7 +56,7 @@ public:
     return (tv.tv_sec == 0) && (tv.tv_nsec == 0);
   }
 
-  void normalize() {
+  constexpr void normalize() {
     if (tv.tv_nsec > 1000000000ul) {
       tv.tv_sec = cap_to_u32_max(tv.tv_sec + tv.tv_nsec / (1000000000ul));
       tv.tv_nsec %= 1000000000ul;
@@ -64,12 +64,12 @@ public:
   }
 
   // cons
-  utime_t() { tv.tv_sec = 0; tv.tv_nsec = 0; }
-  utime_t(time_t s, int n) { tv.tv_sec = s; tv.tv_nsec = n; normalize(); }
-  utime_t(const struct ceph_timespec &v) {
+  constexpr utime_t() { tv.tv_sec = 0; tv.tv_nsec = 0; }
+  constexpr utime_t(time_t s, int n) { tv.tv_sec = s; tv.tv_nsec = n; normalize(); }
+  constexpr utime_t(const struct ceph_timespec &v) {
     decode_timeval(&v);
   }
-  utime_t(const struct timespec v)
+  constexpr utime_t(const struct timespec v)
   {
     // NOTE: this is used by ceph_clock_now() so should be kept
     // as thin as possible.
@@ -125,9 +125,9 @@ public:
   }
 
   // accessors
-  time_t        sec()  const { return tv.tv_sec; }
-  long          usec() const { return tv.tv_nsec/1000; }
-  int           nsec() const { return tv.tv_nsec; }
+  constexpr time_t  sec()  const { return tv.tv_sec; }
+  constexpr long    usec() const { return tv.tv_nsec/1000; }
+  constexpr int     nsec() const { return tv.tv_nsec; }
 
   // ref accessors/modifiers
   __u32&         sec_ref()  { return tv.tv_sec; }
@@ -187,7 +187,7 @@ public:
     t->tv_sec = tv.tv_sec;
     t->tv_nsec = tv.tv_nsec;
   }
-  void decode_timeval(const struct ceph_timespec *t) {
+  constexpr void decode_timeval(const struct ceph_timespec *t) {
     tv.tv_sec = t->tv_sec;
     tv.tv_nsec = t->tv_nsec;
   }
@@ -223,7 +223,7 @@ public:
   }
 
   // cast to double
-  operator double() const {
+  constexpr operator double() const {
     return (double)sec() + ((double)nsec() / 1000000000.0f);
   }
   operator ceph_timespec() const {
-- 
2.39.5