-wip refactoring 2

kamchatka-volcano · Jul 14, 2024 · c94ed1c · c94ed1c
1 parent fe30c1b
commit c94ed1c
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,4 +105,8 @@ endif()
 
 if (ASYNCGI_USE_BOOST_ASIO)
     target_compile_definitions(asyncgi PUBLIC "ASYNCGI_USE_BOOST_ASIO")
-endif()
+endif()
+
+if (ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE)
+    target_compile_definitions(asyncgi PUBLIC "ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE")
+endif ()
diff --git a/examples/example_client.cpp b/examples/example_client.cpp
@@ -1,8 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <iostream>
 
-using namespace asyncgi;
-
 int main()
 {
     auto io = asyncgi::IO{};

diff --git a/examples/example_client_in_processor.cpp b/examples/example_client_in_processor.cpp
@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 struct RequestPage{
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

diff --git a/examples/example_guestbook.cpp b/examples/example_guestbook.cpp
@@ -3,7 +3,6 @@
 #include <optional>
 #include <regex>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

diff --git a/examples/example_hello_world.cpp b/examples/example_hello_world.cpp
@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 int main()
 {
     auto io = asyncgi::IO{};

diff --git a/examples/example_request_processor.cpp b/examples/example_request_processor.cpp
@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 http::Response guestBookPage(const http::Request& request)
 {
     if (request.path() == "/")

diff --git a/examples/example_response_dispatching_asio_task.cpp b/examples/example_response_dispatching_asio_task.cpp
@@ -6,8 +6,6 @@ namespace asio = boost::asio;
 #include <asio/steady_timer.hpp>
 #endif
 
-namespace http = asyncgi::http;
-
 struct DelayedPage {
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

diff --git a/examples/example_response_wait_future.cpp b/examples/example_response_wait_future.cpp
@@ -1,8 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <thread>
 
-using namespace asyncgi;
-
 struct DelayedPage{
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

diff --git a/examples/example_route_context.cpp b/examples/example_route_context.cpp
@@ -2,7 +2,6 @@
 #include <mutex>
 #include <optional>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

diff --git a/examples/example_route_matcher.cpp b/examples/example_route_matcher.cpp
@@ -2,7 +2,6 @@
 #include <mutex>
 #include <optional>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

diff --git a/examples/example_route_params.cpp b/examples/example_route_params.cpp
@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-using namespace asyncgi;
 using namespace std::string_literals;
 
 class GuestBookState {

diff --git a/examples/example_route_params_user_defined_types.cpp b/examples/example_route_params_user_defined_types.cpp
@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-using namespace asyncgi;
 using namespace std::string_literals;
 
 struct MessageNumber {

diff --git a/examples/example_router.cpp b/examples/example_router.cpp
@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 class GuestBookState {

diff --git a/examples/example_timer.cpp b/examples/example_timer.cpp
@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 struct Greeter{
     Greeter(const int& secondsCounter)
         : secondsCounter_{&secondsCounter}

diff --git a/include/asyncgi/asyncgi.h b/include/asyncgi/asyncgi.h
@@ -10,4 +10,8 @@
 #include "server.h"
 #include "timer.h"
 
+#ifndef ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE
+namespace http = asyncgi::http;
+#endif
+
 #endif //ASYNCGI_H
diff --git a/include/asyncgi/asyncgi_fwd.h b/include/asyncgi/asyncgi_fwd.h
@@ -3,7 +3,6 @@
 
 namespace asyncgi {
 class IO;
-class Request;
 class Responder;
 class Server;
 class Client;
@@ -13,13 +12,19 @@ class TaskContext;
 class Timer;
 
 namespace http {
+class Request;
 class Response;
-};
+}; //namespace http
+
 namespace fastcgi {
-struct Request;
-struct Response;
+class Request;
+class Response;
 } //namespace fastcgi
 
 } //namespace asyncgi
 
+#ifndef ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE
+namespace http = asyncgi::http;
+#endif
+
 #endif //ASYNCGI_FWD_H