From: Kefu Chai <kchai@redhat.com>
Date: Fri, 18 Sep 2020 03:01:19 +0000 (+0800)
Subject: src: Revert "Fix to raise BOOST_MPL_LIMIT_LIST_SIZE from 20 to 30"
X-Git-Tag: v16.1.0~1047^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=822b91e4d1ca0da528b15adab1db42f39529d702;p=ceph.git

src: Revert "Fix to raise BOOST_MPL_LIMIT_LIST_SIZE from 20 to 30"

This reverts commit 3f4e9a4526b8f174888828078e610769b80e48ec.

will fix the FTBFS by introducing a interface library in CMake script

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
index 31c9556ff489..ce6b6695d289 100644
--- a/src/crimson/admin/osd_admin.cc
+++ b/src/crimson/admin/osd_admin.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/admin/osd_admin.h"
 #include <string>
 #include <string_view>
diff --git a/src/crimson/admin/pg_commands.cc b/src/crimson/admin/pg_commands.cc
index 98b5b1c55b2d..dacfd515db48 100644
--- a/src/crimson/admin/pg_commands.cc
+++ b/src/crimson/admin/pg_commands.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/admin/pg_commands.h"
 
 #include <memory>
diff --git a/src/crimson/osd/backfill_state.cc b/src/crimson/osd/backfill_state.cc
index 7336c50299a9..1ffadd4e8483 100644
--- a/src/crimson/osd/backfill_state.cc
+++ b/src/crimson/osd/backfill_state.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <algorithm>
 #include <boost/type_index.hpp>
 
diff --git a/src/crimson/osd/ec_backend.cc b/src/crimson/osd/ec_backend.cc
index 44496e82bd9a..c6516d50a8e8 100644
--- a/src/crimson/osd/ec_backend.cc
+++ b/src/crimson/osd/ec_backend.cc
@@ -1,8 +1,3 @@
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "ec_backend.h"
 
 #include "crimson/osd/shard_services.h"
diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index 3d2eacd07e3c..d8dc1e550e16 100644
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "heartbeat.h"
 
 #include <boost/range/join.hpp>
diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 9f082352d5d4..a90903e72271 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/crimson/osd/objclass.cc b/src/crimson/osd/objclass.cc
index 516eaf677247..0017a21b02aa 100644
--- a/src/crimson/osd/objclass.cc
+++ b/src/crimson/osd/objclass.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <cstdarg>
 #include <cstring>
 #include "common/ceph_context.h"
diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc
index decbdf8332a8..027fac9a7039 100644
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "ops_executer.h"
 
 #include <boost/range/adaptor/filtered.hpp>
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 6e9651b0db13..a170d7ccf779 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "osd.h"
 
 #include <sys/utsname.h>
diff --git a/src/crimson/osd/osd_operations/background_recovery.cc b/src/crimson/osd/osd_operations/background_recovery.cc
index 2e52aa2b68aa..40407e708d7d 100644
--- a/src/crimson/osd/osd_operations/background_recovery.cc
+++ b/src/crimson/osd/osd_operations/background_recovery.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <seastar/core/future.hh>
 
 #include "messages/MOSDOp.h"
diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 8602c242b9bb..a51cc7256d64 100644
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <seastar/core/future.hh>
 
 #include "messages/MOSDOp.h"
diff --git a/src/crimson/osd/osd_operations/compound_peering_request.cc b/src/crimson/osd/osd_operations/compound_peering_request.cc
index 909df8080f93..e55760096e4e 100644
--- a/src/crimson/osd/osd_operations/compound_peering_request.cc
+++ b/src/crimson/osd/osd_operations/compound_peering_request.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <seastar/core/future.hh>
 
 #include "osd/PeeringState.h"
diff --git a/src/crimson/osd/osd_operations/peering_event.cc b/src/crimson/osd/osd_operations/peering_event.cc
index 50c6bca6df5f..d3c6ccf817f8 100644
--- a/src/crimson/osd/osd_operations/peering_event.cc
+++ b/src/crimson/osd/osd_operations/peering_event.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <seastar/core/future.hh>
 
 #include "messages/MOSDPGLog.h"
diff --git a/src/crimson/osd/osd_operations/pg_advance_map.cc b/src/crimson/osd/osd_operations/pg_advance_map.cc
index d38c3e2858ab..a96479d4076e 100644
--- a/src/crimson/osd/osd_operations/pg_advance_map.cc
+++ b/src/crimson/osd/osd_operations/pg_advance_map.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/osd/osd_operations/pg_advance_map.h"
 
 #include <boost/smart_ptr/local_shared_ptr.hpp>
diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc
index 5139dfc92a2b..34487f9e458e 100644
--- a/src/crimson/osd/osd_operations/replicated_request.cc
+++ b/src/crimson/osd/osd_operations/replicated_request.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "replicated_request.h"
 
 #include "common/Formatter.h"
diff --git a/src/crimson/osd/osdmap_gate.cc b/src/crimson/osd/osdmap_gate.cc
index abcb530e8966..90afc32b4e40 100644
--- a/src/crimson/osd/osdmap_gate.cc
+++ b/src/crimson/osd/osdmap_gate.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/common/exception.h"
 #include "crimson/osd/osdmap_gate.h"
 #include "crimson/osd/shard_services.h"
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 974bcbf184b9..3abe129c2fe4 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "pg.h"
 
 #include <functional>
diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc
index 2532e31d6575..08071f2604fe 100644
--- a/src/crimson/osd/pg_map.cc
+++ b/src/crimson/osd/pg_map.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/osd/pg_map.h"
 
 #include "crimson/osd/pg.h"
diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index 2bc52c4b582b..95121f292f69 100644
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc
index ed4567fd4f4a..c3c4ed9a5c88 100644
--- a/src/crimson/osd/recovery_backend.cc
+++ b/src/crimson/osd/recovery_backend.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <fmt/format.h>
 
 #include "crimson/common/exception.h"
diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc
index ce2bd8764e82..51fe69394fa6 100644
--- a/src/crimson/osd/replicated_backend.cc
+++ b/src/crimson/osd/replicated_backend.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "replicated_backend.h"
 
 #include "messages/MOSDRepOpReply.h"
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 7904696ffe7c..57f64652af7e 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <seastar/core/future.hh>
diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index 8d04c6c04a9b..46c6d710df6e 100644
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "crimson/osd/shard_services.h"
 
 #include "messages/MOSDAlive.h"
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 627df53fea6b..dc25f604c35a 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -15,11 +15,6 @@
 #ifndef CEPH_OSD_H
 #define CEPH_OSD_H
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "PG.h"
 
 #include "msg/Dispatcher.h"
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 60ab31235169..b9f4e37477f4 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -15,11 +15,6 @@
 #ifndef CEPH_PG_H
 #define CEPH_PG_H
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/container/flat_set.hpp>
 #include "include/mempool.h"
diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index ba219024259b..4025afc8b8d6 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -15,10 +15,6 @@
  *
  */
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
 
 #include "common/errno.h"
 #include "common/scrub_types.h"
diff --git a/src/osd/PGPeeringEvent.h b/src/osd/PGPeeringEvent.h
index 1cc25fea817e..2828880f6565 100644
--- a/src/osd/PGPeeringEvent.h
+++ b/src/osd/PGPeeringEvent.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <boost/statechart/event.hpp>
 
 #include "osd/osd_types.h"
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index af51893e4161..309f114d0c07 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "PGPeeringEvent.h"
 #include "common/ceph_releases.h"
 #include "common/dout.h"
diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index e0fe39883366..657d9a638d64 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <boost/statechart/custom_reaction.hpp>
 #include <boost/statechart/event.hpp>
 #include <boost/statechart/simple_state.hpp>
diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index 469af37a60e7..b34b62ca5d96 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -17,11 +17,6 @@
 #ifndef CEPH_REPLICATEDPG_H
 #define CEPH_REPLICATEDPG_H
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <boost/tuple/tuple.hpp>
 #include "include/ceph_assert.h"
 #include "DynamicPerfStats.h"
diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index b8b88685290f..7c71aa26fe7a 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -11,12 +11,6 @@
  * Foundation.  See file COPYING.
  *
  */
-
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "common/errno.h"
 #include "ReplicatedBackend.h"
 #include "messages/MOSDOp.h"
diff --git a/src/osd/Session.h b/src/osd/Session.h
index 450cc5204815..a42d37bfecc0 100644
--- a/src/osd/Session.h
+++ b/src/osd/Session.h
@@ -15,11 +15,6 @@
 #ifndef CEPH_OSD_SESSION_H
 #define CEPH_OSD_SESSION_H
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "common/RefCountedObj.h"
 #include "common/ceph_mutex.h"
 #include "global/global_context.h"
diff --git a/src/osd/objclass.cc b/src/osd/objclass.cc
index f823b0e5115b..73c5406856a5 100644
--- a/src/osd/objclass.cc
+++ b/src/osd/objclass.cc
@@ -1,11 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <cstdarg>
 #include "common/ceph_context.h"
 #include "common/ceph_releases.h"
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 8cb92c642426..f1bf86e445c2 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -18,11 +18,6 @@
 #ifndef CEPH_OSD_TYPES_H
 #define CEPH_OSD_TYPES_H
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <atomic>
 #include <sstream>
 #include <cstdio>
diff --git a/src/osd/scheduler/OpScheduler.cc b/src/osd/scheduler/OpScheduler.cc
index 8bb85bdb89c0..2f656966bb4d 100644
--- a/src/osd/scheduler/OpScheduler.cc
+++ b/src/osd/scheduler/OpScheduler.cc
@@ -12,11 +12,6 @@
  *
  */
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <ostream>
 
 #include "osd/scheduler/OpScheduler.h"
diff --git a/src/osd/scheduler/mClockScheduler.cc b/src/osd/scheduler/mClockScheduler.cc
index 1b39dbdf4923..0e96fbfae0d7 100644
--- a/src/osd/scheduler/mClockScheduler.cc
+++ b/src/osd/scheduler/mClockScheduler.cc
@@ -16,11 +16,6 @@
 #include <memory>
 #include <functional>
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "osd/scheduler/mClockScheduler.h"
 #include "common/dout.h"
 
diff --git a/src/test/osd/TestMClockScheduler.cc b/src/test/osd/TestMClockScheduler.cc
index e73f634170a8..65e2a1ae91fc 100644
--- a/src/test/osd/TestMClockScheduler.cc
+++ b/src/test/osd/TestMClockScheduler.cc
@@ -2,11 +2,6 @@
 
 #include "gtest/gtest.h"
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/common_init.h"
diff --git a/src/test/osd/test_ec_transaction.cc b/src/test/osd/test_ec_transaction.cc
index 2a22ddc86532..98669667a777 100644
--- a/src/test/osd/test_ec_transaction.cc
+++ b/src/test/osd/test_ec_transaction.cc
@@ -12,11 +12,6 @@
  *
  */
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <gtest/gtest.h>
 #include "osd/PGTransaction.h"
 #include "osd/ECTransaction.h"
diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index b8d3c5f51d3c..d9abe03af6ed 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -12,11 +12,6 @@
  *
  */
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/parsers.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc
index 22015eae8052..8e3d5b458880 100644
--- a/src/tools/rebuild_mondb.cc
+++ b/src/tools/rebuild_mondb.cc
@@ -1,9 +1,3 @@
-
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
-#   define BOOST_MPL_LIMIT_LIST_SIZE 30
-#endif
-
 #include "auth/cephx/CephxKeyServer.h"
 #include "common/errno.h"
 #include "mon/AuthMonitor.h"