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 +6 -4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ed479c8c3e - Show all commits

10
include/fc/container/zeroed_array.hpp
View file

@ -1,4 +1,3 @@
#pragma once
/* /*
* Copyright (c) 2019 BitShares Blockchain Foundation, and contributors * Copyright (c) 2019 BitShares Blockchain Foundation, and contributors
* *
@ -22,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#pragma once
#include <fc/io/raw_fwd.hpp> #include <fc/io/raw_fwd.hpp>
namespace fc { namespace fc {
@ -65,8 +65,10 @@ namespace fc {
pack( s, static_cast<const std::array<unsigned char,N>&>( v ), _max_depth ); pack( s, static_cast<const std::array<unsigned char,N>&>( v ), _max_depth );
} }
template<typename Stream, size_t N> template<typename Stream, size_t N>
inline void unpack( Stream& s, zero_initialized_array<unsigned char,N>& v, uint32_t _max_depth ) { try { inline void unpack( Stream& s, zero_initialized_array<unsigned char,N>& v, uint32_t _max_depth ) {
unpack( s, static_cast<std::array<unsigned char,N>&>( v ), _max_depth ); try {
} FC_RETHROW_EXCEPTIONS( warn, "zero_initialized_array<unsigned char,${length}>", ("length",N) ) } unpack( s, static_cast<std::array<unsigned char,N>&>( v ), _max_depth );
} FC_RETHROW_EXCEPTIONS( warn, "zero_initialized_array<unsigned char,${length}>", ("length",N) )
}
} }
} }