Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ciphrex/mSIGNA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mperklin/mSIGNA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on May 22, 2015

  1. Added default destructors to various exception classes to resolve som…

    …e issues when compiling against GCC 4.6
    Michael Perklin committed May 22, 2015
    Copy the full SHA
    de5e756 View commit details
Showing with 8 additions and 1 deletion.
  1. +2 −1 deps/CoinCore/src/bip39.h
  2. +5 −0 deps/CoinDB/src/VaultExceptions.h
  3. +1 −0 deps/CoinQ/src/CoinQ_exceptions.h
3 changes: 2 additions & 1 deletion deps/CoinCore/src/bip39.h
Original file line number Diff line number Diff line change
@@ -43,7 +43,8 @@ class InvalidWordException : public std::runtime_error
explicit InvalidWordException(const std::string& word) : std::runtime_error("Invalid word."), word_(word) { }

const std::string& word() const { return word_; }

~InvalidWordException() throw() { }

private:
std::string word_;
};
5 changes: 5 additions & 0 deletions deps/CoinDB/src/VaultExceptions.h
Original file line number Diff line number Diff line change
@@ -117,6 +117,7 @@ class VaultWrongNetworkException : public VaultException
explicit VaultWrongNetworkException(const std::string& vault_name, const std::string& network) : VaultException("Wrong network.", VAULT_WRONG_NETWORK, vault_name), network_(network) { }

const std::string& network() const { return network_; }
~VaultWrongNetworkException() throw() { }

private:
std::string network_;
@@ -128,6 +129,7 @@ class VaultFailedToOpenDatabaseException : public VaultException
explicit VaultFailedToOpenDatabaseException(const std::string& vault_name, const std::string& dberror) : VaultException("Failed to open database.", VAULT_FAILED_TO_OPEN_DATABASE, vault_name), dberror_(dberror) { }

const std::string& dberror() const { return dberror_; }
~VaultFailedToOpenDatabaseException() throw() { }

private:
std::string dberror_;
@@ -139,6 +141,7 @@ class VaultMissingTxsException : public VaultException
explicit VaultMissingTxsException(const std::string& vault_name, const hashvector_t& txhashes) : VaultException("Vault is missing transactions.", VAULT_MISSING_TXS, vault_name), txhashes_(txhashes) { }

const hashvector_t& txhashes() const { return txhashes_; }
~VaultMissingTxsException() throw() { }

private:
hashvector_t txhashes_;
@@ -293,6 +296,7 @@ class AccountInsufficientFundsException : public AccountException
uint64_t available() const { return available_; }
const std::string& username() const { return username_; }
void username(const std::string& username) { username_ = username; }
~AccountInsufficientFundsException() throw() { }

private:
uint64_t requested_;
@@ -403,6 +407,7 @@ class TxOutputScriptNotInUserWhitelistException : public TxException
explicit TxOutputScriptNotInUserWhitelistException(const std::string& username, const bytes_t& txoutscript) : TxException("Transaction output script is not in user whitelist.", TX_OUTPUT_SCRIPT_NOT_IN_USER_WHITELIST, bytes_t()), username_(username), txoutscript_(txoutscript) { }
const std::string& username() const { return username_; }
const bytes_t& txoutscript() const { return txoutscript_; }
~TxOutputScriptNotInUserWhitelistException() throw() { }

protected:
std::string username_;
1 change: 1 addition & 0 deletions deps/CoinQ/src/CoinQ_exceptions.h
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ class NetworkSelectorNoNetworkSelectedException : public NetworkSelectorExceptio
{
public:
explicit NetworkSelectorNoNetworkSelectedException() : NetworkSelectorException("No network selected.", NETWORKSELECTOR_NO_NETWORK_SELECTED) {}
~NetworkSelectorNoNetworkSelectedException() throw() { }
};

class NetworkSelectorNetworkNotRecognizedException : public NetworkSelectorException