From 2cc0d73609645233554a16792fb70554b15d72ad Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Sun, 14 Feb 2016 17:22:23 -0500 Subject: [PATCH 1/3] check_reflect.py: Detect #575 (*_object using FC_REFLECT rather than FC_REFLECT_DERIVED) --- programs/build_helpers/check_reflect.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/build_helpers/check_reflect.py b/programs/build_helpers/check_reflect.py index d655b846..0f41f355 100755 --- a/programs/build_helpers/check_reflect.py +++ b/programs/build_helpers/check_reflect.py @@ -87,6 +87,8 @@ for root, dirs, files in os.walk("."): cname = m.group(1) members = bubble_list(m.group(2)) name2members_re[cname] = members + if cname.endswith("_object"): + print("FC_REFLECT on {} should be FC_REFLECT_DERIVED".format(cname)) for m in re_reflect_derived.finditer(content): cname = m.group(1) members = bubble_list(m.group(3)) From b1f8c8f291b1fac470e3dc112ee9d9683b7e6b26 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Sun, 14 Feb 2016 17:26:35 -0500 Subject: [PATCH 2/3] buyback_object.hpp: Don't FC_REFLECT buyback_object, FC_REFLECT_DERIVED it instead #538 #575 --- libraries/chain/include/graphene/chain/buyback_object.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/include/graphene/chain/buyback_object.hpp b/libraries/chain/include/graphene/chain/buyback_object.hpp index de84b0e2..79b4886b 100644 --- a/libraries/chain/include/graphene/chain/buyback_object.hpp +++ b/libraries/chain/include/graphene/chain/buyback_object.hpp @@ -64,4 +64,4 @@ typedef generic_index< buyback_object, buyback_multi_index_type > buyback_index; } } // graphene::chain -FC_REFLECT( graphene::chain::buyback_object, (asset_to_buy) ) +FC_REFLECT_DERIVED( graphene::chain::buyback_object, (graphene::db::object), (asset_to_buy) ) From 3fa79740dfea0b573e9ca6d1c4f07b1a83f9ea85 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 13 Feb 2016 17:12:17 +0100 Subject: [PATCH 3/3] Reflect ID of force_settlement_object, fix #575 --- libraries/chain/include/graphene/chain/market_object.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/chain/include/graphene/chain/market_object.hpp b/libraries/chain/include/graphene/chain/market_object.hpp index 1bc2fe3e..c41def13 100644 --- a/libraries/chain/include/graphene/chain/market_object.hpp +++ b/libraries/chain/include/graphene/chain/market_object.hpp @@ -206,4 +206,7 @@ FC_REFLECT_DERIVED( graphene::chain::limit_order_object, FC_REFLECT_DERIVED( graphene::chain::call_order_object, (graphene::db::object), (borrower)(collateral)(debt)(call_price) ) -FC_REFLECT( graphene::chain::force_settlement_object, (owner)(balance)(settlement_date) ) +FC_REFLECT_DERIVED( graphene::chain::force_settlement_object, + (graphene::db::object), + (owner)(balance)(settlement_date) + )