zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tl::expected follow-up to address @str4d's comments. 

Co-authored-by: Jack Grigg <jack@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2022-12-09 01:36:45 +00:00
parent 11d5639049
commit 619456a4f4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
depends/packages/packages.mk
View File

@ -1,5 +1,5 @@
zcash_packages := libsodium rustcxx utfcpp
packages := boost libevent zeromq $(zcash_packages) googletest tl_expected
zcash_packages := libsodium rustcxx utfcpp tl_expected
packages := boost libevent zeromq $(zcash_packages) googletest
native_packages := native_clang native_ccache native_rust native_cxxbridge
ifneq (,$(wildcard /etc/arch-release))

4
depends/packages/tl_expected.mk
View File

@ -11,6 +11,6 @@ define $(package)_preprocess_cmds
endef
define $(package)_stage_cmds
mkdir $($(package)_staging_dir)$(host_prefix)/include && \
cp include/tl/expected.hpp $($(package)_staging_dir)$(host_prefix)/include
mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \
cp -r include/tl $($(package)_staging_dir)$(host_prefix)/include
endef

2
src/coins.h
View File

@ -18,7 +18,7 @@
#include <stdint.h>
#include <boost/unordered_map.hpp>
#include <expected.hpp>
#include <tl/expected.hpp>
#include "zcash/History.hpp"
#include "zcash/IncrementalMerkleTree.hpp"