From 3f4e9a4526b8f174888828078e610769b80e48ec Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 30 Jul 2020 15:38:19 -0700 Subject: [PATCH] Fix to raise BOOST_MPL_LIMIT_LIST_SIZE from 20 to 30 Signed-off-by: David Zafman --- src/crimson/admin/osd_admin.cc | 5 +++++ src/crimson/admin/pg_commands.cc | 5 +++++ src/crimson/osd/backfill_state.cc | 5 +++++ src/crimson/osd/ec_backend.cc | 5 +++++ src/crimson/osd/heartbeat.cc | 5 +++++ src/crimson/osd/main.cc | 5 +++++ src/crimson/osd/objclass.cc | 5 +++++ src/crimson/osd/ops_executer.cc | 5 +++++ src/crimson/osd/osd.cc | 5 +++++ src/crimson/osd/osd_operations/background_recovery.cc | 5 +++++ src/crimson/osd/osd_operations/client_request.cc | 5 +++++ src/crimson/osd/osd_operations/compound_peering_request.cc | 5 +++++ src/crimson/osd/osd_operations/peering_event.cc | 5 +++++ src/crimson/osd/osd_operations/pg_advance_map.cc | 5 +++++ src/crimson/osd/osd_operations/replicated_request.cc | 5 +++++ src/crimson/osd/osdmap_gate.cc | 5 +++++ src/crimson/osd/pg.cc | 5 +++++ src/crimson/osd/pg_map.cc | 5 +++++ src/crimson/osd/pg_recovery.cc | 5 +++++ src/crimson/osd/recovery_backend.cc | 5 +++++ src/crimson/osd/replicated_backend.cc | 5 +++++ src/crimson/osd/replicated_recovery_backend.cc | 5 +++++ src/crimson/osd/shard_services.cc | 5 +++++ src/osd/OSD.h | 5 +++++ src/osd/PG.h | 5 +++++ src/osd/PGBackend.cc | 4 ++++ src/osd/PGPeeringEvent.h | 5 +++++ src/osd/PeeringState.cc | 5 +++++ src/osd/PeeringState.h | 5 +++++ src/osd/PrimaryLogPG.h | 5 +++++ src/osd/ReplicatedBackend.cc | 6 ++++++ src/osd/Session.h | 5 +++++ src/osd/objclass.cc | 5 +++++ src/osd/osd_types.h | 5 +++++ src/osd/scheduler/OpScheduler.cc | 5 +++++ src/osd/scheduler/mClockScheduler.cc | 5 +++++ src/test/osd/TestMClockScheduler.cc | 5 +++++ src/test/osd/test_ec_transaction.cc | 5 +++++ src/tools/ceph_objectstore_tool.cc | 5 +++++ src/tools/rebuild_mondb.cc | 6 ++++++ 40 files changed, 201 insertions(+) diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc index ce6b6695d2892..31c9556ff489a 100644 --- a/src/crimson/admin/osd_admin.cc +++ b/src/crimson/admin/osd_admin.cc @@ -1,6 +1,11 @@ // -*- 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 #include diff --git a/src/crimson/admin/pg_commands.cc b/src/crimson/admin/pg_commands.cc index dacfd515db481..98b5b1c55b2d0 100644 --- a/src/crimson/admin/pg_commands.cc +++ b/src/crimson/admin/pg_commands.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/backfill_state.cc b/src/crimson/osd/backfill_state.cc index 1ffadd4e8483c..7336c50299a9c 100644 --- a/src/crimson/osd/backfill_state.cc +++ b/src/crimson/osd/backfill_state.cc @@ -1,6 +1,11 @@ // -*- 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 #include diff --git a/src/crimson/osd/ec_backend.cc b/src/crimson/osd/ec_backend.cc index c6516d50a8e8f..44496e82bd9ac 100644 --- a/src/crimson/osd/ec_backend.cc +++ b/src/crimson/osd/ec_backend.cc @@ -1,3 +1,8 @@ +#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 d8dc1e550e168..3d2eacd07e3c5 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index a90903e72271e..9f082352d5d4b 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -1,6 +1,11 @@ // -*- 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 #include diff --git a/src/crimson/osd/objclass.cc b/src/crimson/osd/objclass.cc index 0017a21b02aa7..516eaf677247c 100644 --- a/src/crimson/osd/objclass.cc +++ b/src/crimson/osd/objclass.cc @@ -1,6 +1,11 @@ // -*- 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 #include #include "common/ceph_context.h" diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index 027fac9a7039e..decbdf8332a83 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index a170d7ccf7799..6e9651b0db13c 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/osd_operations/background_recovery.cc b/src/crimson/osd/osd_operations/background_recovery.cc index 40407e708d7de..2e52aa2b68aa1 100644 --- a/src/crimson/osd/osd_operations/background_recovery.cc +++ b/src/crimson/osd/osd_operations/background_recovery.cc @@ -1,6 +1,11 @@ // -*- 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 #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 a51cc7256d640..8602c242b9bb0 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -1,6 +1,11 @@ // -*- 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 #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 e55760096e4e8..909df8080f93f 100644 --- a/src/crimson/osd/osd_operations/compound_peering_request.cc +++ b/src/crimson/osd/osd_operations/compound_peering_request.cc @@ -1,6 +1,11 @@ // -*- 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 #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 d3c6ccf817f82..50c6bca6df5f2 100644 --- a/src/crimson/osd/osd_operations/peering_event.cc +++ b/src/crimson/osd/osd_operations/peering_event.cc @@ -1,6 +1,11 @@ // -*- 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 #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 a96479d4076e7..d38c3e2858abf 100644 --- a/src/crimson/osd/osd_operations/pg_advance_map.cc +++ b/src/crimson/osd/osd_operations/pg_advance_map.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc index 34487f9e458ed..5139dfc92a2bb 100644 --- a/src/crimson/osd/osd_operations/replicated_request.cc +++ b/src/crimson/osd/osd_operations/replicated_request.cc @@ -1,6 +1,11 @@ // -*- 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 90afc32b4e404..abcb530e89667 100644 --- a/src/crimson/osd/osdmap_gate.cc +++ b/src/crimson/osd/osdmap_gate.cc @@ -1,6 +1,11 @@ // -*- 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 3abe129c2fe41..974bcbf184b98 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -1,6 +1,11 @@ // -*- 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 diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc index 08071f2604fec..2532e31d65756 100644 --- a/src/crimson/osd/pg_map.cc +++ b/src/crimson/osd/pg_map.cc @@ -1,6 +1,11 @@ // -*- 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 473be5f974760..68d37e7d386ca 100644 --- a/src/crimson/osd/pg_recovery.cc +++ b/src/crimson/osd/pg_recovery.cc @@ -1,6 +1,11 @@ // -*- 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 #include diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc index 77a5480a97509..5bae2c9396e02 100644 --- a/src/crimson/osd/recovery_backend.cc +++ b/src/crimson/osd/recovery_backend.cc @@ -1,6 +1,11 @@ // -*- 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 #include "crimson/common/exception.h" diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc index 51fe69394fa65..ce2bd8764e822 100644 --- a/src/crimson/osd/replicated_backend.cc +++ b/src/crimson/osd/replicated_backend.cc @@ -1,6 +1,11 @@ // -*- 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 e888d4e9142b6..d534b7af8a51d 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -1,6 +1,11 @@ // -*- 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 #include #include diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index 46c6d710df6e6..8d04c6c04a9b8 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -1,6 +1,11 @@ // -*- 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 dc25f604c35aa..627df53fea6b4 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -15,6 +15,11 @@ #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 2b17ba52c537d..28651a6955ed2 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -15,6 +15,11 @@ #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 #include #include "include/mempool.h" diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 4025afc8b8d63..ba219024259b5 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -15,6 +15,10 @@ * */ +#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 2828880f6565a..1cc25fea817e3 100644 --- a/src/osd/PGPeeringEvent.h +++ b/src/osd/PGPeeringEvent.h @@ -3,6 +3,11 @@ #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 #include "osd/osd_types.h" diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc index c600431600c49..891405e1c63f9 100644 --- a/src/osd/PeeringState.cc +++ b/src/osd/PeeringState.cc @@ -1,6 +1,11 @@ // -*- 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 56f76081bf861..7583a583b5fe1 100644 --- a/src/osd/PeeringState.h +++ b/src/osd/PeeringState.h @@ -3,6 +3,11 @@ #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 #include #include diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index b34b62ca5d964..469af37a60e7f 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -17,6 +17,11 @@ #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 #include "include/ceph_assert.h" #include "DynamicPerfStats.h" diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 7c71aa26fe7a2..b8b88685290fa 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -11,6 +11,12 @@ * 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 a42d37bfecc09..450cc5204815c 100644 --- a/src/osd/Session.h +++ b/src/osd/Session.h @@ -15,6 +15,11 @@ #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 73c5406856a56..f823b0e5115b7 100644 --- a/src/osd/objclass.cc +++ b/src/osd/objclass.cc @@ -1,6 +1,11 @@ // -*- 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 #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 f1bf86e445c2d..8cb92c6424260 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -18,6 +18,11 @@ #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 #include #include diff --git a/src/osd/scheduler/OpScheduler.cc b/src/osd/scheduler/OpScheduler.cc index 2f656966bb4d1..8bb85bdb89c05 100644 --- a/src/osd/scheduler/OpScheduler.cc +++ b/src/osd/scheduler/OpScheduler.cc @@ -12,6 +12,11 @@ * */ +#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#if !defined(BOOST_MPL_LIMIT_LIST_SIZE) +# define BOOST_MPL_LIMIT_LIST_SIZE 30 +#endif + #include #include "osd/scheduler/OpScheduler.h" diff --git a/src/osd/scheduler/mClockScheduler.cc b/src/osd/scheduler/mClockScheduler.cc index 0e96fbfae0d7f..1b39dbdf49232 100644 --- a/src/osd/scheduler/mClockScheduler.cc +++ b/src/osd/scheduler/mClockScheduler.cc @@ -16,6 +16,11 @@ #include #include +#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 65e2a1ae91fc9..e73f634170a89 100644 --- a/src/test/osd/TestMClockScheduler.cc +++ b/src/test/osd/TestMClockScheduler.cc @@ -2,6 +2,11 @@ #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 98669667a7772..2a22ddc865324 100644 --- a/src/test/osd/test_ec_transaction.cc +++ b/src/test/osd/test_ec_transaction.cc @@ -12,6 +12,11 @@ * */ +#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#if !defined(BOOST_MPL_LIMIT_LIST_SIZE) +# define BOOST_MPL_LIMIT_LIST_SIZE 30 +#endif + #include #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 d9abe03af6edf..b8d3c5f51d3cf 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -12,6 +12,11 @@ * */ +#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#if !defined(BOOST_MPL_LIMIT_LIST_SIZE) +# define BOOST_MPL_LIMIT_LIST_SIZE 30 +#endif + #include #include #include diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc index 8e3d5b4588802..22015eae8052c 100644 --- a/src/tools/rebuild_mondb.cc +++ b/src/tools/rebuild_mondb.cc @@ -1,3 +1,9 @@ + +#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" -- 2.39.5