]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: migrate PGLOG_* macros to constexpr 19352/head
authorJesse Williamson <jwilliamson@suse.de>
Tue, 5 Dec 2017 20:42:01 +0000 (12:42 -0800)
committerJesse Williamson <jwilliamson@suse.de>
Fri, 8 Dec 2017 18:10:42 +0000 (10:10 -0800)
Fixes: http://tracker.ceph.com/issues/20811
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
src/osd/PGLog.h

index 2a940f8cee33a5391b75abea5407486977fb083d..64be3740985c59120208b46d87df76a9fe5fc384 100644 (file)
 #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;