Skip to content

Commit 08a49e8

Browse files
jmjatlantajmjatlanta
authored
Merge pull request #1818 from pmconrad/fix_external_serialization
Fix external serialization
2 parents de4988d + 681d5db commit 08a49e8

File tree

92 files changed

+402
-400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+402
-400
lines changed

‎libraries/chain/account_object.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,6 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::account_statistics_object,
351351
(pending_fees)(pending_vested_fees)
352352
)
353353

354-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_object )
355-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_balance_object )
356-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_statistics_object )
354+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_object )
355+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_balance_object )
356+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::account_statistics_object )

‎libraries/chain/asset_object.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,6 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::asset_object, (graphene::db::ob
204204
(buyback_account)
205205
)
206206

207-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_object )
208-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_bitasset_data_object )
209-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_dynamic_data_object )
207+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_object )
208+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_bitasset_data_object )
209+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::asset_dynamic_data_object )

‎libraries/chain/genesis_state.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type, BOOST_PP_SEQ
6565
(initial_committee_candidates)(initial_worker_candidates)
6666
(immutable_parameters))
6767

68-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_account_type )
69-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type )
70-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
71-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_balance_type )
72-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_vesting_balance_type )
73-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_witness_type )
74-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_committee_member_type )
75-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_worker_type )
76-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type )
68+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_account_type )
69+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type )
70+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
71+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_balance_type )
72+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_vesting_balance_type )
73+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_witness_type )
74+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_committee_member_type )
75+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_worker_type )
76+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type )

‎libraries/chain/include/graphene/chain/account_object.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,6 @@ FC_REFLECT_TYPENAME( graphene::chain::account_object )
451451
FC_REFLECT_TYPENAME( graphene::chain::account_balance_object )
452452
FC_REFLECT_TYPENAME( graphene::chain::account_statistics_object )
453453

454-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_object )
455-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_balance_object )
456-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_statistics_object )
454+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_object )
455+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_balance_object )
456+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_statistics_object )

‎libraries/chain/include/graphene/chain/asset_object.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,6 @@ FC_REFLECT_TYPENAME( graphene::chain::asset_object )
327327
FC_REFLECT_TYPENAME( graphene::chain::asset_bitasset_data_object )
328328
FC_REFLECT_TYPENAME( graphene::chain::asset_dynamic_data_object )
329329

330-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_object )
331-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_bitasset_data_object )
332-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::asset_dynamic_data_object )
330+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_object )
331+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_bitasset_data_object )
332+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::asset_dynamic_data_object )

‎libraries/chain/include/graphene/chain/balance_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::balance_object)
7575

7676
FC_REFLECT_TYPENAME( graphene::chain::balance_object )
7777

78-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::balance_object )
78+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::balance_object )

‎libraries/chain/include/graphene/chain/block_summary_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::block_summary_object)
5252

5353
FC_REFLECT_TYPENAME( graphene::chain::block_summary_object )
5454

55-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::block_summary_object )
55+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::block_summary_object )

‎libraries/chain/include/graphene/chain/budget_record_object.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::budget_record_object)
7070
FC_REFLECT_TYPENAME( graphene::chain::budget_record )
7171
FC_REFLECT_TYPENAME( graphene::chain::budget_record_object )
7272

73-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::budget_record )
74-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::budget_record_object )
73+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::budget_record )
74+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::budget_record_object )

‎libraries/chain/include/graphene/chain/buyback_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::buyback_object)
6767

6868
FC_REFLECT_TYPENAME( graphene::chain::buyback_object )
6969

70-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::buyback_object )
70+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::buyback_object )

‎libraries/chain/include/graphene/chain/chain_property_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::chain_property_object)
4646

4747
FC_REFLECT_TYPENAME( graphene::chain::chain_property_object )
4848

49-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::chain_property_object )
49+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::chain_property_object )

‎libraries/chain/include/graphene/chain/committee_member_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::committee_member_object)
7575

7676
FC_REFLECT_TYPENAME( graphene::chain::committee_member_object )
7777

78-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::committee_member_object )
78+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::committee_member_object )

‎libraries/chain/include/graphene/chain/confidential_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::blinded_balance_object)
6969

7070
FC_REFLECT_TYPENAME( graphene::chain::blinded_balance_object )
7171

72-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::blinded_balance_object )
72+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::blinded_balance_object )

‎libraries/chain/include/graphene/chain/fba_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::fba_accumulator_object)
5252

5353
FC_REFLECT_TYPENAME( graphene::chain::fba_accumulator_object )
5454

55-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::fba_accumulator_object )
55+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::fba_accumulator_object )

‎libraries/chain/include/graphene/chain/genesis_state.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type::initial_committee_memb
138138
FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type::initial_worker_type )
139139
FC_REFLECT_TYPENAME( graphene::chain::genesis_state_type )
140140

141-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_account_type )
142-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_asset_type )
143-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
144-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_balance_type )
145-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_vesting_balance_type )
146-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_witness_type )
147-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_committee_member_type )
148-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type::initial_worker_type )
149-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::genesis_state_type )
141+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_account_type )
142+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type )
143+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position )
144+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_balance_type )
145+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_vesting_balance_type )
146+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_witness_type )
147+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_committee_member_type )
148+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type::initial_worker_type )
149+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::genesis_state_type )

‎libraries/chain/include/graphene/chain/global_property_object.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::global_property_object)
130130
FC_REFLECT_TYPENAME( graphene::chain::dynamic_global_property_object )
131131
FC_REFLECT_TYPENAME( graphene::chain::global_property_object )
132132

133-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::dynamic_global_property_object )
134-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::global_property_object )
133+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::dynamic_global_property_object )
134+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::global_property_object )

‎libraries/chain/include/graphene/chain/htlc_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ FC_REFLECT_TYPENAME( graphene::chain::htlc_object::condition_info::time_lock_inf
121121
FC_REFLECT_TYPENAME( graphene::chain::htlc_object::condition_info )
122122
FC_REFLECT_TYPENAME( graphene::chain::htlc_object )
123123

124-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::htlc_object )
124+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::htlc_object )

‎libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ struct immutable_chain_parameters
4040

4141
FC_REFLECT_TYPENAME( graphene::chain::immutable_chain_parameters )
4242

43-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::immutable_chain_parameters )
43+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::immutable_chain_parameters )

‎libraries/chain/include/graphene/chain/market_object.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ FC_REFLECT_TYPENAME( graphene::chain::call_order_object )
280280
FC_REFLECT_TYPENAME( graphene::chain::force_settlement_object )
281281
FC_REFLECT_TYPENAME( graphene::chain::collateral_bid_object )
282282

283-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::limit_order_object )
284-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::call_order_object )
285-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::force_settlement_object )
286-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::collateral_bid_object )
283+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::limit_order_object )
284+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::call_order_object )
285+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::force_settlement_object )
286+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::collateral_bid_object )

‎libraries/chain/include/graphene/chain/operation_history_object.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,5 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::account_transaction_history_object)
144144
FC_REFLECT_TYPENAME( graphene::chain::operation_history_object )
145145
FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_object )
146146

147-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::operation_history_object )
148-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_transaction_history_object )
147+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::operation_history_object )
148+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::account_transaction_history_object )

‎libraries/chain/include/graphene/chain/proposal_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::proposal_object)
108108

109109
FC_REFLECT_TYPENAME( graphene::chain::proposal_object )
110110

111-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::proposal_object )
111+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::proposal_object )

‎libraries/chain/include/graphene/chain/special_authority_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::special_authority_object)
6666

6767
FC_REFLECT_TYPENAME( graphene::chain::special_authority_object )
6868

69-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::special_authority_object )
69+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::special_authority_object )

‎libraries/chain/include/graphene/chain/transaction_history_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::transaction_history_object)
7373

7474
FC_REFLECT_TYPENAME( graphene::chain::transaction_history_object )
7575

76-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::transaction_history_object )
76+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::transaction_history_object )

‎libraries/chain/include/graphene/chain/vesting_balance_object.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,6 @@ FC_REFLECT_DERIVED(graphene::chain::vesting_balance_object, (graphene::db::objec
302302

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

305-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::linear_vesting_policy )
306-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::cdd_vesting_policy )
307-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::vesting_balance_object )
305+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::linear_vesting_policy )
306+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::cdd_vesting_policy )
307+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::vesting_balance_object )

‎libraries/chain/include/graphene/chain/withdraw_permission_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::withdraw_permission_object)
121121

122122
FC_REFLECT_TYPENAME( graphene::chain::withdraw_permission_object )
123123

124-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::withdraw_permission_object )
124+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::withdraw_permission_object )

‎libraries/chain/include/graphene/chain/witness_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::witness_object)
7272

7373
FC_REFLECT_TYPENAME( graphene::chain::witness_object )
7474

75-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::witness_object )
75+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::witness_object )

‎libraries/chain/include/graphene/chain/witness_schedule_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::witness_schedule_object)
4242

4343
FC_REFLECT_TYPENAME( graphene::chain::witness_schedule_object )
4444

45-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::witness_schedule_object )
45+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::witness_schedule_object )

‎libraries/chain/include/graphene/chain/worker_object.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ FC_REFLECT_TYPENAME( graphene::chain::burn_worker_type )
167167
FC_REFLECT_TYPENAME( graphene::chain::worker_type )
168168
FC_REFLECT_TYPENAME( graphene::chain::worker_object )
169169

170-
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::worker_object )
170+
GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::worker_object )

‎libraries/chain/market_object.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::force_settlement_object,
319319
FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::collateral_bid_object, (graphene::db::object),
320320
(bidder)(inv_swan_price) )
321321

322-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::limit_order_object )
323-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::call_order_object )
324-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::force_settlement_object )
325-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::collateral_bid_object )
322+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::limit_order_object )
323+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::call_order_object )
324+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::force_settlement_object )
325+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::collateral_bid_object )

‎libraries/chain/proposal_object.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::proposal_object, (graphene::cha
139139
(available_active_approvals)(required_owner_approvals)(available_owner_approvals)
140140
(available_key_approvals)(proposer)(fail_reason) )
141141

142-
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::proposal_object )
142+
GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::proposal_object )

0 commit comments

Comments
 (0)