Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vlad Dobromyslov 2022-02-28 20:15:56 +03:00
commit f52648b6e5
11 changed files with 1041 additions and 1041 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/event_object.cpp
View file

@ -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)
{

2
libraries/chain/game_object.cpp
View file

@ -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

4
libraries/chain/include/graphene/chain/betting_market_object.hpp
View file

@ -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> {

2
libraries/chain/include/graphene/chain/event_object.hpp
View file

@ -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> {

2
libraries/chain/include/graphene/chain/game_object.hpp
View file

@ -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> {

2
libraries/chain/include/graphene/chain/match_object.hpp
View file

@ -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> {

2
libraries/chain/include/graphene/chain/tournament_object.hpp
View file

@ -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> {

1
libraries/chain/tournament_object.cpp
View file

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