From: Jesse Williamson <jwilliamson@suse.de>
Date: Tue, 5 Dec 2017 20:42:01 +0000 (-0800)
Subject: osd: migrate PGLOG_* macros to constexpr
X-Git-Tag: v13.0.2~800^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a286fd35ce69180dec8c4837f6ed97d69b3e0933;p=ceph.git

osd: migrate PGLOG_* macros to constexpr

Fixes: http://tracker.ceph.com/issues/20811
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
---

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 2a940f8cee33..64be3740985c 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -22,14 +22,14 @@
 #include "os/ObjectStore.h"
 #include <list>
 
-#define PGLOG_INDEXED_OBJECTS          (1 << 0)
-#define PGLOG_INDEXED_CALLER_OPS       (1 << 1)
-#define PGLOG_INDEXED_EXTRA_CALLER_OPS (1 << 2)
-#define PGLOG_INDEXED_DUPS             (1 << 3)
-#define PGLOG_INDEXED_ALL              (PGLOG_INDEXED_OBJECTS | \
-					PGLOG_INDEXED_CALLER_OPS | \
-					PGLOG_INDEXED_EXTRA_CALLER_OPS | \
-					PGLOG_INDEXED_DUPS)
+constexpr auto PGLOG_INDEXED_OBJECTS          = 1 << 0;
+constexpr auto PGLOG_INDEXED_CALLER_OPS       = 1 << 1;
+constexpr auto PGLOG_INDEXED_EXTRA_CALLER_OPS = 1 << 2;
+constexpr auto PGLOG_INDEXED_DUPS             = 1 << 3;
+constexpr auto PGLOG_INDEXED_ALL              = PGLOG_INDEXED_OBJECTS 
+                                              | PGLOG_INDEXED_CALLER_OPS 
+                                              | PGLOG_INDEXED_EXTRA_CALLER_OPS 
+                                              | PGLOG_INDEXED_DUPS;
 
 class CephContext;