diff options
| author | Jeffrey Ryan <jeffreyryan@tutanota.com> | 2022-05-22 23:41:41 -0500 |
|---|---|---|
| committer | Lee *!* Clagett <code@leeclagett.com> | 2025-02-13 16:24:48 -0500 |
| commit | 89fa3ed68ae1a21e71a35ad4c21afaa2baae1987 (patch) | |
| tree | ead547961742c854f2fe011f9596bdbda2a35606 /src/daemon | |
| parent | 3b1300d2af24e556508ac1ceb816c74488eb681f (diff) | |
| download | monzero-core-89fa3ed68ae1a21e71a35ad4c21afaa2baae1987.tar.gz monzero-core-89fa3ed68ae1a21e71a35ad4c21afaa2baae1987.tar.xz monzero-core-89fa3ed68ae1a21e71a35ad4c21afaa2baae1987.zip | |
epee: update 'http_server_handlers_map2.h' macros to use fully qualified names
quick patch which fixes the issue where if you use some macros from `http_server_handlers_map2.h` you have to be in the `epee` namespace or it doesn't compile. Now can remove `using namespace epee;` from header file `core_rpc_server.h`, which caused a couple of name qualifying mistakes
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/main.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index 1d4baaa32..38b99ff49 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -83,7 +83,7 @@ uint16_t parse_public_rpc_port(const po::variables_map &vm) } uint16_t rpc_port; - if (!string_tools::get_xtype_from_string(rpc_port, rpc_port_str)) + if (!epee::string_tools::get_xtype_from_string(rpc_port, rpc_port_str)) { throw std::runtime_error("invalid RPC port " + rpc_port_str); } diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index b6364ff77..0d3688c76 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1063,7 +1063,7 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash, cryptonote::blobdata blob; std::string source = as_hex.empty() ? pruned_as_hex + prunable_as_hex : as_hex; bool pruned = !pruned_as_hex.empty() && prunable_as_hex.empty(); - if (!string_tools::parse_hexstr_to_binbuff(source, blob)) + if (!epee::string_tools::parse_hexstr_to_binbuff(source, blob)) { tools::fail_msg_writer() << "Failed to parse tx to get json format"; } |
