From 9486bec0cda858952b5afc78f176e5dfe21be8f7 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 28 Jul 2013 19:42:37 -0700 Subject: [PATCH] Change websocket to use beast::lexicalCast<> --- Subtrees/websocket/src/roles/server.hpp | 2 +- modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Subtrees/websocket/src/roles/server.hpp b/Subtrees/websocket/src/roles/server.hpp index 5f4ae1500e..6f5396d1cf 100644 --- a/Subtrees/websocket/src/roles/server.hpp +++ b/Subtrees/websocket/src/roles/server.hpp @@ -598,7 +598,7 @@ void server::connection::handle_read_request( std::string reply = "" "(m_connection.get_raw_socket().local_endpoint().port()); + reply += beast::lexicalCastThrow (m_connection.get_raw_socket().local_endpoint().port()); reply += "\"/>"; reply.append("\0", 1); diff --git a/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp index 3c6c6e3ede..0110be69a7 100644 --- a/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp +++ b/modules/ripple_app/misc/ripple_ProofOfWorkFactory.cpp @@ -31,6 +31,10 @@ ProofOfWork ProofOfWorkFactory::getProof () POWResult ProofOfWorkFactory::checkProof (const std::string& token, uint256 const& solution) { + // 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; @@ -93,7 +97,7 @@ POWResult ProofOfWorkFactory::checkProof (const std::string& token, uint256 cons return powREUSED; } } - +#endif return powOK; }