Browse Source

Build and warnings fix.

cl-refactor
Gav Wood 10 years ago
parent
commit
93a4fd09ad
  1. 6
      eth/main.cpp
  2. 2
      libethcore/KeyManager.h

6
eth/main.cpp

@ -341,7 +341,7 @@ int main(int argc, char** argv)
string structuredLoggingURL; string structuredLoggingURL;
/// Transaction params /// Transaction params
TransactionPriority priority = TransactionPriority::Medium; // TransactionPriority priority = TransactionPriority::Medium;
// double etherPrice = 30.679; // double etherPrice = 30.679;
// double blockFees = 15.0; // double blockFees = 15.0;
u256 askPrice = c_defaultGasPrice; u256 askPrice = c_defaultGasPrice;
@ -605,7 +605,7 @@ int main(int argc, char** argv)
return -1; return -1;
} }
} }
else if ((arg == "-P" || arg == "--priority") && i + 1 < argc) /* else if ((arg == "-P" || arg == "--priority") && i + 1 < argc)
{ {
string m = boost::to_lower_copy(string(argv[++i])); string m = boost::to_lower_copy(string(argv[++i]));
if (m == "lowest") if (m == "lowest")
@ -626,7 +626,7 @@ int main(int argc, char** argv)
cerr << "Unknown " << arg << " option: " << m << endl; cerr << "Unknown " << arg << " option: " << m << endl;
return -1; return -1;
} }
} }*/
else if ((arg == "-m" || arg == "--mining") && i + 1 < argc) else if ((arg == "-m" || arg == "--mining") && i + 1 < argc)
{ {
string m = argv[++i]; string m = argv[++i];

2
libethcore/KeyManager.h

@ -36,7 +36,7 @@ class PasswordUnknown: public Exception {};
struct KeyInfo struct KeyInfo
{ {
KeyInfo() = default; KeyInfo() = default;
KeyInfo(h256 const& _passHash, std::string const& _accountName, std::string const& _passwordHint): passHash(_passHash), accountName(_accountName), passwordHint(_passwordHint) {} KeyInfo(h256 const& _passHash, std::string const& _accountName, std::string const& _passwordHint = std::string()): passHash(_passHash), accountName(_accountName), passwordHint(_passwordHint) {}
/// Hash of the password or h256() / UnknownPassword if unknown. /// Hash of the password or h256() / UnknownPassword if unknown.
h256 passHash; h256 passHash;

Loading…
Cancel
Save