osd/PG: make some trivial events TrivialEvent

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3eadfa087f3ff5338f87306fd384d1f4749b8005)

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 80b75dc5eb604c82ad4e2de1682e74f2427b574e..7f162efc9f5c3a55a028d469897d4801a3f8687f 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1581,6 +1581,12 @@ public:
   TrivialEvent(RecoveryTooFull)
   TrivialEvent(CancelRecovery)
 
+  TrivialEvent(MakePrimary)
+  TrivialEvent(MakeStray)
+  TrivialEvent(NeedActingChange)
+  TrivialEvent(IsIncomplete)
+  TrivialEvent(IsDown)
+
   TrivialEvent(AllReplicasRecovered)
   TrivialEvent(DoRecovery)
   TrivialEvent(LocalRecoveryReserved)
@@ -1746,12 +1752,6 @@ public:
       }
     };
 
-    struct MakePrimary : boost::statechart::event< MakePrimary > {
-      MakePrimary() : boost::statechart::event< MakePrimary >() {}
-    };
-    struct MakeStray : boost::statechart::event< MakeStray > {
-      MakeStray() : boost::statechart::event< MakeStray >() {}
-    };
     struct Primary;
     struct Stray;
 
@@ -1767,17 +1767,8 @@ public:
 
     struct Peering;
     struct WaitActingChange;
-    struct NeedActingChange : boost::statechart::event< NeedActingChange > {
-      NeedActingChange() : boost::statechart::event< NeedActingChange >() {}
-    };
     struct Incomplete;
-    struct IsIncomplete : boost::statechart::event< IsIncomplete > {
-      IsIncomplete() : boost::statechart::event< IsIncomplete >() {}
-    };
     struct Down;
-    struct IsDown : boost::statechart::event< IsDown > {
-      IsDown() : boost::statechart::event< IsDown >() {}
-    };
 
     struct Primary : boost::statechart::state< Primary, Started, Peering >, NamedState {
       explicit Primary(my_context ctx);