diff --git a/libraries/db/include/graphene/db/type_serializer.hpp b/libraries/db/include/graphene/db/type_serializer.hpp index 17dc6e35..2dd670b7 100644 --- a/libraries/db/include/graphene/db/type_serializer.hpp +++ b/libraries/db/include/graphene/db/type_serializer.hpp @@ -23,9 +23,7 @@ template void register_serializer(); extern map st; -/* extern vector> serializers; -*/ bool register_serializer( const string& name, std::function sr ); @@ -128,7 +126,7 @@ class serialize_member_visitor template void operator()( const char* name )const { - current_stream() << name << " : " << "";//js_name::name(); + current_stream() << " " << name << " : " << fc::get_typename::name() <<"\n"; } }; @@ -268,6 +266,8 @@ std::string get_type_description() current_stream( std::unique_ptr(new std::stringstream()) ); processed_types().clear(); serializer::init(); + for( const auto& gen : serializers ) + gen(); return current_stream().str(); } diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 32fdbbb8..48c55a95 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -30,6 +30,8 @@ using namespace graphene::chain; +namespace detail_ns { + string remove_tail_if( const string& str, char c, const string& match ) { auto last = str.find_last_of( c ); @@ -317,6 +319,8 @@ struct serializer } }; +} // namespace detail_ns + int main( int argc, char** argv ) { try { @@ -326,22 +330,22 @@ int main( int argc, char** argv ) for( uint32_t i = 0; i < op.count(); ++i ) { op.set_which(i); - op.visit( serialize_type_visitor(i) ); + op.visit( detail_ns::serialize_type_visitor(i) ); } std::cout << "\n"; - js_name::name("operation"); - js_name>::name("key_data"); - js_name::name("operation_result"); - js_name::name("header_extension"); - js_name>::name("initializer_type"); - serializer::init(); - serializer::init(); - serializer::init(); - serializer::init(); - serializer::init(); - serializer::init(); - for( const auto& gen : serializers ) + detail_ns::js_name::name("operation"); + detail_ns::js_name>::name("key_data"); + detail_ns::js_name::name("operation_result"); + detail_ns::js_name::name("header_extension"); + detail_ns::js_name>::name("initializer_type"); + detail_ns::serializer::init(); + detail_ns::serializer::init(); + detail_ns::serializer::init(); + detail_ns::serializer::init(); + detail_ns::serializer::init(); + detail_ns::serializer::init(); + for( const auto& gen : detail_ns::serializers ) gen(); } catch ( const fc::exception& e ){ edump((e.to_detail_string())); }