Skip to content

Commit 173ff3d

Browse files
pmconradpmconrad
committed
Separate declaration + instantiation macros for external serialization to fix windows build
1 parent 987298e commit 173ff3d

File tree

91 files changed

+398
-395
lines changed

Some content is hidden

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

91 files changed

+398
-395
lines changed

‎libraries/chain/account_object.cpp‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 9 additions & 9 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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 )

0 commit comments

Comments
 (0)