sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dumb errors on ubuntu

Browse Source
This commit is contained in:
Evan Duffield 2016-05-06 18:36:11 -04:00
parent e6d7f4ed7f
commit 9b7504cb32
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compat/endian.h
View File

@ -108,31 +108,33 @@ inline uint64_t le64toh(uint64_t little_endian_64bits)
#else // WORDS_BIGENDIAN #else // WORDS_BIGENDIAN
#if HAVE_DECL_HTOBE16 == 0 #if HAVE_DECL_HTOBE16 == 0
inline uint16_t htobe16(uint16_t host_16bits) /*inline uint16_t htobe16(uint16_t host_16bits)
{ {
return bswap_16(host_16bits); return bswap_16(host_16bits);
} } */
#endif // HAVE_DECL_HTOBE16 #endif // HAVE_DECL_HTOBE16
#if HAVE_DECL_HTOLE16 == 0 #if HAVE_DECL_HTOLE16 == 0
inline uint16_t htole16(uint16_t host_16bits) /*inline uint16_t htole16(uint16_t host_16bits)
{ {
return host_16bits; return host_16bits;
} } */
#endif // HAVE_DECL_HTOLE16 #endif // HAVE_DECL_HTOLE16
#if HAVE_DECL_BE16TOH == 0 #if HAVE_DECL_BE16TOH == 0
/*
inline uint16_t be16toh(uint16_t big_endian_16bits) inline uint16_t be16toh(uint16_t big_endian_16bits)
{ {
return bswap_16(big_endian_16bits); return bswap_16(big_endian_16bits);
} } */
#endif // HAVE_DECL_BE16TOH #endif // HAVE_DECL_BE16TOH
#if HAVE_DECL_LE16TOH == 0 #if HAVE_DECL_LE16TOH == 0
inline uint16_t le16toh(uint16_t little_endian_16bits) /*
inlineuint16_t le16toh(uint16_t little_endian_16bits)
{ {
return little_endian_16bits; return little_endian_16bits;
} } */
#endif // HAVE_DECL_LE16TOH #endif // HAVE_DECL_LE16TOH
#if HAVE_DECL_HTOBE32 == 0 #if HAVE_DECL_HTOBE32 == 0

3
src/governance.cpp
View File

@ -329,7 +329,8 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C
int nConf = 0; int nConf = 0;
if(!IsCollateralValid(budgetProposalBroadcast.nFeeTXHash, budgetProposalBroadcast.GetHash(), strError, budgetProposalBroadcast.nTime, nConf, GOVERNANCE_FEE_TX)){ if(!IsCollateralValid(budgetProposalBroadcast.nFeeTXHash, budgetProposalBroadcast.GetHash(), strError, budgetProposalBroadcast.nTime, nConf, GOVERNANCE_FEE_TX)){
LogPrintf("Proposal FeeTX is not valid - %s - %s\n", budgetProposalBroadcast.nFeeTXHash.ToString(), strError); LogPrintf("Proposal FeeTX is not valid - %s - %s\n", budgetProposalBroadcast.nFeeTXHash.ToString(), strError);
if(nConf >= 1) vecImmatureBudgetProposals.push_back(budgetProposalBroadcast); //todo 12.1
//if(nConf >= 1) vecImmatureBudgetProposals.push_back(budgetProposalBroadcast);
return; return;
} }

4
src/rpcmasternode-budget.cpp
View File

@ -46,7 +46,7 @@ int ConvertVoteOutcome(std::string strVoteOutcome)
// convert custom sentinel outcomes to integer and store // convert custom sentinel outcomes to integer and store
try { try {
int i = std::stoi(strVoteOutcome); int i = boost::lexical_cast<int>(strVoteOutcome);
if(i < VOTE_ACTION_CUSTOM_START || i > VOTE_ACTION_CUSTOM_END) return -1; if(i < VOTE_ACTION_CUSTOM_START || i > VOTE_ACTION_CUSTOM_END) return -1;
return i; return i;
} }
@ -467,4 +467,4 @@ UniValue voteraw(const UniValue& params, bool fHelp)
} else { } else {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Error voting : " + strError); throw JSONRPCError(RPC_INTERNAL_ERROR, "Error voting : " + strError);
} }
} }