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

Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
Conversation 0 Commits 144 Files changed 636 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 04694f9c40 - Show all commits

4
include/fc/container/flat_fwd.hpp
View file

@ -16,8 +16,8 @@ namespace fc {
void unpack( Stream& s, flat_set<T>& value ); void unpack( Stream& s, flat_set<T>& value );
template<typename Stream, typename K, typename... V> template<typename Stream, typename K, typename... V>
void pack( Stream& s, const flat_map<K,V...>& value ); void pack( Stream& s, const flat_map<K,V...>& value );
template<typename Stream, typename K, typename... V> template<typename Stream, typename K, typename V, typename... A>
void unpack( Stream& s, flat_map<K,V...>& value ) ; void unpack(Stream& s, flat_map<K, V, A...>& value);
template<typename Stream, typename T, typename A> template<typename Stream, typename T, typename A>

4
include/fc/variant.hpp
View file

@ -90,8 +90,8 @@ namespace fc
template<typename K, typename... T> template<typename K, typename... T>
void to_variant( const fc::flat_map<K,T...>& var, variant& vo ); void to_variant( const fc::flat_map<K,T...>& var, variant& vo );
template<typename K, typename... T> template<typename K, typename T, typename... A>
void from_variant( const variant& var, fc::flat_map<K,T...>& vo ); void from_variant(const variant& var, flat_map<K, T, A...>& vo);
template<typename K, typename T> template<typename K, typename T>
void to_variant( const std::map<K,T>& var, variant& vo ); void to_variant( const std::map<K,T>& var, variant& vo );