From a286fd35ce69180dec8c4837f6ed97d69b3e0933 Mon Sep 17 00:00:00 2001 From: Jesse Williamson Date: Tue, 5 Dec 2017 12:42:01 -0800 Subject: [PATCH] osd: migrate PGLOG_* macros to constexpr Fixes: http://tracker.ceph.com/issues/20811 Signed-off-by: Jesse Williamson --- src/osd/PGLog.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 2a940f8cee33a..64be3740985c5 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -22,14 +22,14 @@ #include "os/ObjectStore.h" #include -#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; -- 2.47.3