From 47a5fcc40446f95de4b812561a0648c8fbeb674d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Oct 2017 07:23:19 -0500
Subject: [PATCH] osd/PG: fix clang build vs private state events

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/osd/PG.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 3cb5c30d057..38891b5cbd1 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1689,6 +1689,7 @@ protected:
     }
   };
 
+public:
   struct MInfoRec : boost::statechart::event< MInfoRec > {
     pg_shard_t from;
     pg_info_t info;
@@ -1699,7 +1700,6 @@ protected:
       *out << "MInfoRec from " << from << " info: " << info;
     }
   };
-
   struct MLogRec : boost::statechart::event< MLogRec > {
     pg_shard_t from;
     boost::intrusive_ptr<MOSDPGLog> msg;
@@ -1721,7 +1721,6 @@ protected:
         << " features: 0x" << hex << features << dec;
     }
   };
-
   struct MQuery : boost::statechart::event< MQuery > {
     pg_shard_t from;
     pg_query_t query;
@@ -1734,6 +1733,7 @@ protected:
 	   << " query: " << query;
     }
   };
+protected:
 
   struct AdvMap : boost::statechart::event< AdvMap > {
     OSDMapRef osdmap;
@@ -1768,6 +1768,7 @@ protected:
       *out << "Activate from " << activation_epoch;
     }
   };
+public:
   struct RequestBackfillPrio : boost::statechart::event< RequestBackfillPrio > {
     unsigned priority;
     explicit RequestBackfillPrio(unsigned prio) :
@@ -1797,22 +1798,28 @@ protected:
       *out << "DeferRecovery: delay " << delay;
     }
   };
-
+protected:
   TrivialEvent(Initialize)
   TrivialEvent(Load)
   TrivialEvent(GotInfo)
   TrivialEvent(NeedUpThru)
+  public:
   TrivialEvent(NullEvt)
+  protected:
   TrivialEvent(FlushedEvt)
   TrivialEvent(Backfilled)
   TrivialEvent(LocalBackfillReserved)
+  public:
   TrivialEvent(RemoteBackfillReserved)
+  protected:
   TrivialEvent(RejectRemoteReservation)
+  public:
   TrivialEvent(RemoteReservationRejected)
   TrivialEvent(RemoteReservationCanceled)
   TrivialEvent(RequestBackfill)
   TrivialEvent(RequestRecovery)
   TrivialEvent(RecoveryDone)
+  protected:
   TrivialEvent(BackfillTooFull)
   TrivialEvent(RecoveryTooFull)
 
@@ -1825,7 +1832,9 @@ protected:
   TrivialEvent(AllReplicasRecovered)
   TrivialEvent(DoRecovery)
   TrivialEvent(LocalRecoveryReserved)
+  public:
   TrivialEvent(RemoteRecoveryReserved)
+  protected:
   TrivialEvent(AllRemotesReserved)
   TrivialEvent(AllBackfillsReserved)
   TrivialEvent(GoClean)
-- 
2.47.3