diff --git a/src/scord-ctl/rpc_handlers.cpp b/src/scord-ctl/rpc_handlers.cpp index c021a46615f5f99885d3ea71d4b1ec55396bf5e6..3db4be92b4c26d0d3e4144e07cbccc3c2eb0981c 100644 --- a/src/scord-ctl/rpc_handlers.cpp +++ b/src/scord-ctl/rpc_handlers.cpp @@ -34,7 +34,7 @@ struct remote_procedure { } }; -namespace scord::network::handlers { +namespace scord_ctl::network::handlers { void ping(const scord::network::request& req) { @@ -59,4 +59,4 @@ ping(const scord::network::request& req) { req.respond(resp); } -} // namespace scord::network::handlers +} // namespace scord_ctl::network::handlers diff --git a/src/scord-ctl/rpc_handlers.hpp b/src/scord-ctl/rpc_handlers.hpp index a896d794450e89ad51687f839c48bf2a89b893cf..085ec9ca34bf52a02c8a7a4b3fcf42b3ed576ef7 100644 --- a/src/scord-ctl/rpc_handlers.hpp +++ b/src/scord-ctl/rpc_handlers.hpp @@ -29,11 +29,11 @@ #include <net/serialization.hpp> #include <scord/types.hpp> -namespace scord::network::handlers { +namespace scord_ctl::network::handlers { void ping(const scord::network::request& req); -} // namespace scord::network::handlers +} // namespace scord_ctl::network::handlers #endif // SCORD_CTL_RPC_HANDLERS_HPP diff --git a/src/scord-ctl/scord-ctl.cpp b/src/scord-ctl/scord-ctl.cpp index ab2d1e0fa9b6c3e1ed80f7b34c01ccfea3ab1a85..17a03ab292dc9480e9ca4c3bb9403d202f4c6c71 100644 --- a/src/scord-ctl/scord-ctl.cpp +++ b/src/scord-ctl/scord-ctl.cpp @@ -85,7 +85,8 @@ main(int argc, char* argv[]) { // convenience macro to ensure the names of an RPC and its handler // always match -#define EXPAND(rpc_name) "ADM_" #rpc_name##s, scord::network::handlers::rpc_name +#define EXPAND(rpc_name) \ + "ADM_" #rpc_name##s, scord_ctl::network::handlers::rpc_name srv.set_handler(EXPAND(ping));