Date: Tue, 23 Jan 2018 17:15:59 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459788 - head/net-p2p/qtum/files Message-ID: <201801231715.w0NHFx81063751@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Tue Jan 23 17:15:59 2018 New Revision: 459788 URL: https://svnweb.freebsd.org/changeset/ports/459788 Log: net-p2p/qtum: Fix compilation on FreeBSD 10 (Clang 3.4) Added: head/net-p2p/qtum/files/patch-src_wallet_wallet.h (contents, props changed) Added: head/net-p2p/qtum/files/patch-src_wallet_wallet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/qtum/files/patch-src_wallet_wallet.h Tue Jan 23 17:15:59 2018 (r459788) @@ -0,0 +1,270 @@ +--- src/wallet/wallet.h.orig 2018-01-23 18:15:09.538396000 +0200 ++++ src/wallet/wallet.h 2018-01-23 18:15:13.206365000 +0200 +@@ -90,8 +90,6 @@ + class CScript; + class CTxMemPool; + class CWalletTx; +-class CTokenTx; +-class CContractBookData; + + /** (client) version numbers for particular wallet features */ + enum WalletFeature +@@ -579,6 +577,129 @@ + std::vector<char> _ssExtra; + }; + ++/** Contract book data */ ++class CContractBookData ++{ ++public: ++ std::string name; ++ std::string abi; ++ ++ CContractBookData() ++ {} ++}; ++ ++class CTokenTx ++{ ++public: ++ static const int CURRENT_VERSION=1; ++ int nVersion; ++ std::string strContractAddress; ++ std::string strSenderAddress; ++ std::string strReceiverAddress; ++ uint256 nValue; ++ uint256 transactionHash; ++ ++ // Wallet data for token transaction ++ int64_t nCreateTime; ++ uint256 blockHash; ++ int64_t blockNumber; ++ std::string strLabel; ++ ++ CTokenTx() ++ { ++ SetNull(); ++ } ++ ++ ADD_SERIALIZE_METHODS; ++ ++ template <typename Stream, typename Operation> ++ inline void SerializationOp(Stream& s, Operation ser_action) { ++ if (!(s.GetType() & SER_GETHASH)) ++ { ++ READWRITE(nVersion); ++ READWRITE(nCreateTime); ++ READWRITE(blockHash); ++ READWRITE(blockNumber); ++ READWRITE(LIMITED_STRING(strLabel, 65536)); ++ } ++ READWRITE(strContractAddress); ++ READWRITE(strSenderAddress); ++ READWRITE(strReceiverAddress); ++ READWRITE(nValue); ++ READWRITE(transactionHash); ++ } ++ ++ void SetNull() ++ { ++ nVersion = CTokenTx::CURRENT_VERSION; ++ nCreateTime = 0; ++ strContractAddress = ""; ++ strSenderAddress = ""; ++ strReceiverAddress = ""; ++ nValue.SetNull(); ++ transactionHash.SetNull(); ++ blockHash.SetNull(); ++ blockNumber = -1; ++ strLabel = ""; ++ } ++ ++ uint256 GetHash() const; ++}; ++ ++class CTokenInfo ++{ ++public: ++ static const int CURRENT_VERSION=1; ++ int nVersion; ++ std::string strContractAddress; ++ std::string strTokenName; ++ std::string strTokenSymbol; ++ uint8_t nDecimals; ++ std::string strSenderAddress; ++ ++ // Wallet data for token transaction ++ int64_t nCreateTime; ++ uint256 blockHash; ++ int64_t blockNumber; ++ ++ CTokenInfo() ++ { ++ SetNull(); ++ } ++ ++ ADD_SERIALIZE_METHODS; ++ ++ template <typename Stream, typename Operation> ++ inline void SerializationOp(Stream& s, Operation ser_action) { ++ if (!(s.GetType() & SER_GETHASH)) ++ { ++ READWRITE(nVersion); ++ READWRITE(nCreateTime); ++ READWRITE(strTokenName); ++ READWRITE(strTokenSymbol); ++ READWRITE(blockHash); ++ READWRITE(blockNumber); ++ } ++ READWRITE(nDecimals); ++ READWRITE(strContractAddress); ++ READWRITE(strSenderAddress); ++ } ++ ++ void SetNull() ++ { ++ nVersion = CTokenInfo::CURRENT_VERSION; ++ nCreateTime = 0; ++ strContractAddress = ""; ++ strTokenName = ""; ++ strTokenSymbol = ""; ++ nDecimals = 0; ++ strSenderAddress = ""; ++ blockHash.SetNull(); ++ blockNumber = -1; ++ } ++ ++ uint256 GetHash() const; ++}; + + /** + * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, +@@ -1156,128 +1277,4 @@ + return true; + } + +-class CTokenInfo +-{ +-public: +- static const int CURRENT_VERSION=1; +- int nVersion; +- std::string strContractAddress; +- std::string strTokenName; +- std::string strTokenSymbol; +- uint8_t nDecimals; +- std::string strSenderAddress; +- +- // Wallet data for token transaction +- int64_t nCreateTime; +- uint256 blockHash; +- int64_t blockNumber; +- +- CTokenInfo() +- { +- SetNull(); +- } +- +- ADD_SERIALIZE_METHODS; +- +- template <typename Stream, typename Operation> +- inline void SerializationOp(Stream& s, Operation ser_action) { +- if (!(s.GetType() & SER_GETHASH)) +- { +- READWRITE(nVersion); +- READWRITE(nCreateTime); +- READWRITE(strTokenName); +- READWRITE(strTokenSymbol); +- READWRITE(blockHash); +- READWRITE(blockNumber); +- } +- READWRITE(nDecimals); +- READWRITE(strContractAddress); +- READWRITE(strSenderAddress); +- } +- +- void SetNull() +- { +- nVersion = CTokenInfo::CURRENT_VERSION; +- nCreateTime = 0; +- strContractAddress = ""; +- strTokenName = ""; +- strTokenSymbol = ""; +- nDecimals = 0; +- strSenderAddress = ""; +- blockHash.SetNull(); +- blockNumber = -1; +- } +- +- uint256 GetHash() const; +-}; +- +-class CTokenTx +-{ +-public: +- static const int CURRENT_VERSION=1; +- int nVersion; +- std::string strContractAddress; +- std::string strSenderAddress; +- std::string strReceiverAddress; +- uint256 nValue; +- uint256 transactionHash; +- +- // Wallet data for token transaction +- int64_t nCreateTime; +- uint256 blockHash; +- int64_t blockNumber; +- std::string strLabel; +- +- CTokenTx() +- { +- SetNull(); +- } +- +- ADD_SERIALIZE_METHODS; +- +- template <typename Stream, typename Operation> +- inline void SerializationOp(Stream& s, Operation ser_action) { +- if (!(s.GetType() & SER_GETHASH)) +- { +- READWRITE(nVersion); +- READWRITE(nCreateTime); +- READWRITE(blockHash); +- READWRITE(blockNumber); +- READWRITE(LIMITED_STRING(strLabel, 65536)); +- } +- READWRITE(strContractAddress); +- READWRITE(strSenderAddress); +- READWRITE(strReceiverAddress); +- READWRITE(nValue); +- READWRITE(transactionHash); +- } +- +- void SetNull() +- { +- nVersion = CTokenTx::CURRENT_VERSION; +- nCreateTime = 0; +- strContractAddress = ""; +- strSenderAddress = ""; +- strReceiverAddress = ""; +- nValue.SetNull(); +- transactionHash.SetNull(); +- blockHash.SetNull(); +- blockNumber = -1; +- strLabel = ""; +- } +- +- uint256 GetHash() const; +-}; +- +-/** Contract book data */ +-class CContractBookData +-{ +-public: +- std::string name; +- std::string abi; +- +- CContractBookData() +- {} +-}; +- + #endif // BITCOIN_WALLET_WALLET_H
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801231715.w0NHFx81063751>