DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jl777/FSM' into duke

Browse Source 
Conflicts:
	src/hushd
	src/komodo_bitcoind.h
This commit is contained in:
Jonathan "Duke" Leto
2019-07-17 20:51:52 -07:00
parent 06520c26ea bd1fdc15af
commit 7ca4e59831
83 changed files with 5266 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util.cpp
View File

@@ -414,7 +414,7 @@ void SplitStr(const std::string& strVal, std::vector<std::string> &outVals)
}
}
void Split(const std::string& strVal, uint64_t *outVals, const uint64_t nDefault)
void Split(const std::string& strVal, int32_t outsize, uint64_t *outVals, const uint64_t nDefault)
{
stringstream ss(strVal);
vector<uint64_t> vec;
@@ -442,7 +442,7 @@ void Split(const std::string& strVal, uint64_t *outVals, const uint64_t nDefault
else
nLast = nDefault;
for ( i = numVals; i < ASSETCHAINS_MAX_ERAS; i++ )
for ( i = numVals; i < outsize; i++ )
{
outVals[i] = nLast;
}