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

Updates from BitShares FC #22

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

4
include/fc/static_variant.hpp
View file

@ -118,7 +118,7 @@ public:
template<typename X, typename = type_in_typelist<X>> template<typename X, typename = type_in_typelist<X>>
struct tag struct tag
{ {
static constexpr int value = typelist::index_of<list, X>(); static constexpr tag_type value = typelist::index_of<list, X>();
}; };
struct type_lt { struct type_lt {
@ -302,7 +302,7 @@ public:
}); });
} }
static constexpr int count() { return typelist::length<list>(); } static constexpr size_t count() { return typelist::length<list>(); }
void set_which( tag_type w ) { void set_which( tag_type w ) {
FC_ASSERT( w >= 0 ); FC_ASSERT( w >= 0 );
FC_ASSERT( w < count() ); FC_ASSERT( w < count() );