From c3aee1dee844552d31ab26df9bf93e69e5b30aa8 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sat, 20 Jul 2024 22:13:49 -0700 Subject: [PATCH] root: macro: web: namespace refactor into common --- container/src/root/macro/common/server.hh | 8 ++++---- container/src/root/macro/web/server.C | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/container/src/root/macro/common/server.hh b/container/src/root/macro/common/server.hh index daf78b8..03412ac 100644 --- a/container/src/root/macro/common/server.hh +++ b/container/src/root/macro/common/server.hh @@ -36,16 +36,16 @@ namespace docker_finance //! \since docker-finance 1.0.0 namespace macro { -//! \namespace docker_finance::macro::internal -//! \brief ROOT macros for internal use only +//! \namespace docker_finance::macro::common +//! \brief Shared ROOT macro-related functionality //! \since docker-finance 1.0.0 -namespace internal +namespace common { //! \brief HTTP Server instance //! \note In namespace scope because of ROOT's static functions requirement //! \since docker-finance 1.0.0 auto g_HTTPServer = std::make_unique<::THttpServer>("http:8080"); -} // namespace internal +} // namespace common } // namespace macro } // namespace docker_finance diff --git a/container/src/root/macro/web/server.C b/container/src/root/macro/web/server.C index 617935d..b875d10 100644 --- a/container/src/root/macro/web/server.C +++ b/container/src/root/macro/web/server.C @@ -61,16 +61,15 @@ class Server final static void register_commands() { namespace common = ::docker_finance::macro::common; - namespace internal = ::docker_finance::macro::internal; common::Command::load({"web/internal/crypto.C"}); - internal::g_HTTPServer->RegisterCommand( + common::g_HTTPServer->RegisterCommand( "/rng_sample", "::docker_finance::macro::web::internal::Random::rng_sample(\"%arg1%" "\")"); common::Command::load({"web/internal/meta.C"}); - internal::g_HTTPServer->RegisterCommand( + common::g_HTTPServer->RegisterCommand( "/meta_sample", "::docker_finance::macro::web::internal::Meta::meta_sample(\"%arg1%" "\")");