]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
common: fix enum redeclaration 22615/head
authorQiaowei Ren <qiaowei.ren@intel.com>
Tue, 19 Jun 2018 03:12:21 +0000 (11:12 +0800)
committerQiaowei Ren <qiaowei.ren@intel.com>
Wed, 20 Jun 2018 05:36:54 +0000 (13:36 +0800)
commit33464cc5c7dd6c9318c171e79f655c283cc89435
tree6ee49187174a2a3f45c1828af93187568efe4832
parent33c773a810a20c4853313301bfd483c64f78a07a
common: fix enum redeclaration

This patch fixes the error about enum redeclaration during compile time.

The error is from the enum declaration in src/common/perf_counters.h:

enum unit_t : uint8_t
{
  BYTES,
  NONE
};

When external library also includes similar declaratiron, the following
error will appear:
  error: redeclaration of enumerator 'NONE'
  error: previous definition of 'NONE' ...

Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>
14 files changed:
src/common/perf_counters.cc
src/common/perf_counters.h
src/librbd/ImageCtx.cc
src/mon/Monitor.cc
src/mon/Paxos.cc
src/msg/async/Stack.h
src/msg/async/dpdk/DPDK.cc
src/msg/async/rdma/RDMAStack.cc
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/os/filestore/WBThrottle.cc
src/osd/OSD.cc
src/osdc/ObjectCacher.cc
src/osdc/Objecter.cc