Skip to content

Commit

Permalink
Merge pull request #1818 from pmconrad/fix_external_serialization
Browse files Browse the repository at this point in the history 
Fix external serialization
  • Loading branch information
@jmjatlanta
jmjatlanta authored Jun 21, 2019
2 parents de4988d + 681d5db commit 08a49e8
Show file tree
Hide file tree
Showing 92 changed files with 402 additions and 400 deletions.
6 changes: 3 additions & 3 deletions libraries/chain/account_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,6 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::account_statistics_object,
(pending_fees)(pending_vested_fees)
)

GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_balance_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_statistics_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_balance_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_statistics_object )
6 changes: 3 additions & 3 deletions libraries/chain/asset_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,6 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::asset_object, (graphene::db::ob
(buyback_account)
)

GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_bitasset_data_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_dynamic_data_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_bitasset_data_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_dynamic_data_object )
18 changes: 9 additions & 9 deletions libraries/chain/genesis_state.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type, BOOST_PP_SEQ
(initial_committee_candidates)(initial_worker_candidates)
(immutable_parameters))

GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_account_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_balance_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_vesting_balance_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_witness_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_committee_member_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_worker_type )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_account_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_balance_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_vesting_balance_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_witness_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_committee_member_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_worker_type )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type )
6 changes: 3 additions & 3 deletions libraries/chain/include/graphene/chain/account_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,6 @@ FC_REFLECT_TYPENAME( graphene::chain::account_object )
FC_REFLECT_TYPENAME( graphene::chain::account_balance_object )
FC_REFLECT_TYPENAME( graphene::chain::account_statistics_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_balance_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_statistics_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_balance_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_statistics_object )
6 changes: 3 additions & 3 deletions libraries/chain/include/graphene/chain/asset_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,6 @@ FC_REFLECT_TYPENAME( graphene::chain::asset_object )
FC_REFLECT_TYPENAME( graphene::chain::asset_bitasset_data_object )
FC_REFLECT_TYPENAME( graphene::chain::asset_dynamic_data_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_bitasset_data_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_dynamic_data_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_bitasset_data_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_dynamic_data_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/balance_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::balance_object)

FC_REFLECT_TYPENAME( graphene::chain::balance_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::balance_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::balance_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/block_summary_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::block_summary_object)

FC_REFLECT_TYPENAME( graphene::chain::block_summary_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::block_summary_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::block_summary_object )
4 changes: 2 additions & 2 deletions libraries/chain/include/graphene/chain/budget_record_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::budget_record_object)
FC_REFLECT_TYPENAME( graphene::chain::budget_record )
FC_REFLECT_TYPENAME( graphene::chain::budget_record_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::budget_record )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::budget_record_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::budget_record )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::budget_record_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/buyback_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::buyback_object)

FC_REFLECT_TYPENAME( graphene::chain::buyback_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::buyback_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::buyback_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/chain_property_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::chain_property_object)

FC_REFLECT_TYPENAME( graphene::chain::chain_property_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::chain_property_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::chain_property_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/committee_member_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::committee_member_object)

FC_REFLECT_TYPENAME( graphene::chain::committee_member_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::committee_member_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::committee_member_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/confidential_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::blinded_balance_object)

FC_REFLECT_TYPENAME( graphene::chain::blinded_balance_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::blinded_balance_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::blinded_balance_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/fba_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::fba_accumulator_object)

FC_REFLECT_TYPENAME( graphene::chain::fba_accumulator_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::fba_accumulator_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::fba_accumulator_object )
18 changes: 9 additions & 9 deletions libraries/chain/include/graphene/chain/genesis_state.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type::initial_committee_memb
FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type::initial_worker_type )
FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_account_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_asset_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_balance_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_vesting_balance_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_witness_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_committee_member_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_worker_type )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_account_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_balance_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_vesting_balance_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_witness_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_committee_member_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_worker_type )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type )
4 changes: 2 additions & 2 deletions libraries/chain/include/graphene/chain/global_property_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::global_property_object)
FC_REFLECT_TYPENAME( graphene::chain::dynamic_global_property_object )
FC_REFLECT_TYPENAME( graphene::chain::global_property_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::dynamic_global_property_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::global_property_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::dynamic_global_property_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::global_property_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/htlc_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ FC_REFLECT_TYPENAME( graphene::chain::htlc_object::condition_info::time_lock_inf
FC_REFLECT_TYPENAME( graphene::chain::htlc_object::condition_info )
FC_REFLECT_TYPENAME( graphene::chain::htlc_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::htlc_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::htlc_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ struct immutable_chain_parameters

FC_REFLECT_TYPENAME( graphene::chain::immutable_chain_parameters )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::immutable_chain_parameters )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::immutable_chain_parameters )
8 changes: 4 additions & 4 deletions libraries/chain/include/graphene/chain/market_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ FC_REFLECT_TYPENAME( graphene::chain::call_order_object )
FC_REFLECT_TYPENAME( graphene::chain::force_settlement_object )
FC_REFLECT_TYPENAME( graphene::chain::collateral_bid_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::limit_order_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::call_order_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::force_settlement_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::collateral_bid_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::limit_order_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::call_order_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::force_settlement_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::collateral_bid_object )
4 changes: 2 additions & 2 deletions libraries/chain/include/graphene/chain/operation_history_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::account_transaction_history_object)
FC_REFLECT_TYPENAME( graphene::chain::operation_history_object )
FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::operation_history_object )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_transaction_history_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::operation_history_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_transaction_history_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/proposal_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::proposal_object)

FC_REFLECT_TYPENAME( graphene::chain::proposal_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::proposal_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::proposal_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/special_authority_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::special_authority_object)

FC_REFLECT_TYPENAME( graphene::chain::special_authority_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::special_authority_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::special_authority_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/transaction_history_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::transaction_history_object)

FC_REFLECT_TYPENAME( graphene::chain::transaction_history_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::transaction_history_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::transaction_history_object )
6 changes: 3 additions & 3 deletions libraries/chain/include/graphene/chain/vesting_balance_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,6 @@ FC_REFLECT_DERIVED(graphene::chain::vesting_balance_object, (graphene::db::objec

FC_REFLECT_ENUM( graphene::chain::vesting_balance_type, (unspecified)(cashback)(worker)(witness)(market_fee_sharing) )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::linear_vesting_policy )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::cdd_vesting_policy )
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::vesting_balance_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::linear_vesting_policy )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::cdd_vesting_policy )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::vesting_balance_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/withdraw_permission_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::withdraw_permission_object)

FC_REFLECT_TYPENAME( graphene::chain::withdraw_permission_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::withdraw_permission_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::withdraw_permission_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/witness_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::witness_object)

FC_REFLECT_TYPENAME( graphene::chain::witness_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::witness_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::witness_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/witness_schedule_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::witness_schedule_object)

FC_REFLECT_TYPENAME( graphene::chain::witness_schedule_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::witness_schedule_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::witness_schedule_object )
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/worker_object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ FC_REFLECT_TYPENAME( graphene::chain::burn_worker_type )
FC_REFLECT_TYPENAME( graphene::chain::worker_type )
FC_REFLECT_TYPENAME( graphene::chain::worker_object )

GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::worker_object )
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::worker_object )
8 changes: 4 additions & 4 deletions libraries/chain/market_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::force_settlement_object,
FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::collateral_bid_object, (graphene::db::object),
(bidder)(inv_swan_price) )

GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::limit_order_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::call_order_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::force_settlement_object )
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::collateral_bid_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::limit_order_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::call_order_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::force_settlement_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::collateral_bid_object )
2 changes: 1 addition & 1 deletion libraries/chain/proposal_object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::proposal_object, (graphene::cha
(available_active_approvals)(required_owner_approvals)(available_owner_approvals)
(available_key_approvals)(proposer)(fail_reason) )

GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::proposal_object )
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::proposal_object )
Loading

0 comments on commit 08a49e8

Please sign in to comment.