Merge remote-tracking branch 'origin/bug/235-corrupt-chain-file' into bug/235-corrupt-chain-file

libraries/chain/event_object.cpp

@@ -344,7 +344,6 @@ struct event_state_machine_ : public msm::front::state_machine_def<event_state_m
          {
             FC_THROW_EXCEPTION(graphene::chain::no_transition, "No transition");
          }
-
          template <class Fsm>
          void no_transition(canceled_event const& e, Fsm&, int state)
          {

libraries/chain/game_object.cpp

@@ -579,3 +579,5 @@ void from_variant(const fc::variant& v, graphene::chain::game_object& game_obj,
       const_cast<int*>(game_obj.my->state_machine.current_state())[0] = (int)state;
    }
 } //end namespace fc
+
+

libraries/chain/include/graphene/chain/betting_market_object.hpp

@@ -754,7 +754,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } }  // namespace fc::raw::detail
 
    template <>
    struct get_typename<graphene::chain::betting_market_object> {
@@ -804,7 +804,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } } // namespace fc::raw:detail
 
    template <>
    struct get_typename<graphene::chain::betting_market_group_object> {

libraries/chain/include/graphene/chain/event_object.hpp

@@ -193,7 +193,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } } // namespace fc::raw::detail
 
    template <>
    struct get_typename<graphene::chain::event_object> {

libraries/chain/include/graphene/chain/game_object.hpp

@@ -196,7 +196,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } } // namespace fc::raw::detail
 
    template <>
    struct get_typename<graphene::chain::game_object> {

libraries/chain/include/graphene/chain/match_object.hpp

@@ -194,7 +194,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } } // namespace fc::raw::detail
 
    template <>
    struct get_typename<graphene::chain::match_object> {

libraries/chain/include/graphene/chain/tournament_object.hpp

@@ -279,7 +279,7 @@ inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, grap
          s >> v;
       }
 
-} }
+   } } // namespace fc::raw::detail
 
    template <>
    struct get_typename<graphene::chain::tournament_object> {

libraries/chain/tournament_object.cpp

@@ -759,4 +759,3 @@ void from_variant(const fc::variant& v, graphene::chain::tournament_object& tour
 } //end namespace fc
 
 
-