From 103dc6facf85a7f2f6e299de522ca25bedeee3cc Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 29 Jul 2013 14:25:01 -0700 Subject: [PATCH] Fix ProofOfWork::checkProof() for lexicalCast changes --- .../ripple_app/misc/ripple_ProofOfWorkFactory.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp index 232e0258a9..260afdb141 100644 --- a/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp +++ b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp @@ -34,7 +34,6 @@ POWResult ProofOfWorkFactory::checkProof (const std::string& token, uint256 cons // VFALCO COmmented this out because Dave said it wasn't used // and also we dont have the lexicalCast from a vector of strings to a time_t -#if 0 // challenge - target - iterations - time - validator std::vector fields; @@ -58,7 +57,14 @@ POWResult ProofOfWorkFactory::checkProof (const std::string& token, uint256 cons challenge.SetHex (fields[0]); target.SetHex (fields[1]); - time_t t = lexicalCast (fields[3]); + time_t t; +#if 0 + // Broken with lexicalCast<> changes + t = lexicalCast (fields[3]); +#else + t = static_cast (lexicalCast (fields [3])); +#endif + time_t now = time (NULL); int iterations = lexicalCast (fields[2]); @@ -97,7 +103,7 @@ POWResult ProofOfWorkFactory::checkProof (const std::string& token, uint256 cons return powREUSED; } } -#endif + return powOK; }