diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-18 20:40:57 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-25 16:49:40 -0700 |
| commit | 12aa53cc940766b5ef1aabbbd1a252659d9654ef (patch) | |
| tree | 633b3be3f15b6bf52e4ac871928ccf7a9309768c | |
| parent | 9df9155c4edc413185e6edeff4f2450af2461cfc (diff) | |
| download | ceph-12aa53cc940766b5ef1aabbbd1a252659d9654ef.tar.gz | |
common/bloom_filter: move header from include/
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/common/Makefile.am | 1 | ||||
| -rw-r--r-- | src/common/bloom_filter.hpp (renamed from src/include/bloom_filter.hpp) | 4 | ||||
| -rw-r--r-- | src/include/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mds/CDir.cc | 2 | ||||
| -rw-r--r-- | src/test/encoding/types.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 9a368f91a07..c29195abade 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -97,6 +97,7 @@ LIBCOMMON_DEPS += libcommon_crc.la noinst_LTLIBRARIES += libcommon_crc.la noinst_HEADERS += \ + common/bloom_filter.hpp \ common/sctp_crc32.h \ common/crc32c_intel_baseline.h \ common/crc32c_intel_fast.h diff --git a/src/include/bloom_filter.hpp b/src/common/bloom_filter.hpp index a65543c88ed..2a1ee2c4217 100644 --- a/src/include/bloom_filter.hpp +++ b/src/common/bloom_filter.hpp @@ -19,8 +19,8 @@ */ -#ifndef INCLUDE_BLOOM_FILTER_HPP -#define INCLUDE_BLOOM_FILTER_HPP +#ifndef COMMON_BLOOM_FILTER_HPP +#define COMMON_BLOOM_FILTER_HPP #include <cstddef> #include <algorithm> diff --git a/src/include/Makefile.am b/src/include/Makefile.am index d702ebd2795..2d98e777f00 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -18,7 +18,6 @@ rados_include_DATA = \ $(srcdir)/include/crc32c.h noinst_HEADERS += \ - include/bloom_filter.hpp \ include/Context.h \ include/CompatSet.h \ include/Distribution.h \ diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index c77ca180a6f..4a5e636d9a6 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -27,7 +27,7 @@ #include "MDLog.h" #include "LogSegment.h" -#include "include/bloom_filter.hpp" +#include "common/bloom_filter.hpp" #include "include/Context.h" #include "common/Clock.h" diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index dd1ea4d570c..3ff2821c428 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -4,7 +4,7 @@ TYPE(CompatSet) #include "include/filepath.h" TYPE(filepath) -#include "include/bloom_filter.hpp" +#include "common/bloom_filter.hpp" TYPE(bloom_filter) #include "common/snap_types.h" |