Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +70 -1
2 changed files with 70 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 46ba4cca5e - Show all commits

28
include/fc/reflect/typename.hpp
View file

@ -2,10 +2,12 @@
#include <deque>
#include <map>
#include <set>
#include <vector>
#include <fc/string.hpp>
#include <fc/optional.hpp>
#include <fc/smart_ref_fwd.hpp>
#include <fc/container/flat_fwd.hpp>
#include <fc/container/deque_fwd.hpp>
@ -69,10 +71,36 @@ namespace fc {
return n.c_str();
}
};
template<typename E> struct get_typename< std::set<E> >
{
static const char* name()
{
static std::string n = std::string("std::set<") + std::string(get_typename<E>::name()) + std::string(">");
return n.c_str();
}
};
template<typename A, typename B> struct get_typename< std::pair<A,B> >
{
static const char* name()
{
static std::string n = std::string("std::pair<") + get_typename<A>::name() + "," + get_typename<B>::name() + ">";
return n.c_str();
}
};
template<typename T> struct get_typename< fc::smart_ref<T> >
{
static const char* name()
{
static std::string n = std::string("fc::smart_ref<") + get_typename<T>::name() + std::string(">");
return n.c_str();
}
};
struct signed_int;
struct unsigned_int;
struct variant_object;
template<> struct get_typename<signed_int> { static const char* name() { return "signed_int"; } };
template<> struct get_typename<unsigned_int> { static const char* name() { return "unsigned_int"; } };
template<> struct get_typename<variant_object> { static const char* name() { return "fc::variant_object"; } };
}

43
include/fc/static_variant.hpp
View file

@ -382,5 +382,46 @@ public:
s.visit( to_static_variant(ar[1], max_depth - 1) );
}
template<typename... T> struct get_typename { static const char* name() { return typeid(static_variant<T...>).name(); } };
template< typename... T > struct get_comma_separated_typenames;
template<>
struct get_comma_separated_typenames<>
{
static const char* names() { return ""; }
};
template< typename T >
struct get_comma_separated_typenames<T>
{
static const char* names()
{
static const std::string n = get_typename<T>::name();
return n.c_str();
}
};
template< typename T, typename... Ts >
struct get_comma_separated_typenames<T, Ts...>
{
static const char* names()
{
static const std::string n =
std::string( get_typename<T>::name() )+","+
std::string( get_comma_separated_typenames< Ts... >::names() );
return n.c_str();
}
};
template< typename... T >
struct get_typename< static_variant< T... > >
{
static const char* name()
{
static const std::string n = std::string( "fc::static_variant<" )
+ get_comma_separated_typenames<T...>::names()
+ ">";
return n.c_str();
}
};
} // namespace fc