Fixes redis.hpp and slightly improves compilation times.

Author: mzimbres

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
+set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_COMMAND} -E time")
+
 project(
     boost_redis
     VERSION 1.4.1
@@ -65,9 +67,9 @@ foreach(lib IN LISTS libs_cpp20 libs_cpp17 libs_common)
    add_library(${lib} STATIC)
 endforeach()
 
-target_sources(boost_redis_src PUBLIC examples/boost_redis.cpp)
-target_sources(tests_common PUBLIC tests/common.cpp)
-target_sources(examples_main PUBLIC examples/main.cpp)
+target_sources(boost_redis_src PRIVATE examples/boost_redis.cpp)
+target_sources(tests_common PRIVATE tests/common.cpp)
+target_sources(examples_main PRIVATE examples/main.cpp)
 
 # Executables
 #=======================================================================
@@ -134,16 +136,17 @@ foreach(exe IN LISTS tests_cpp17 tests_cpp20)
    target_link_libraries(${exe} PRIVATE  tests_common)
 endforeach()
 
-foreach(exe IN LISTS tests_cpp17 tests_cpp20 examples_cpp17 examples_cpp20 libs_cpp17 libs_cpp20 benchmakrs)
-   target_link_libraries(${exe} PRIVATE OpenSSL::Crypto OpenSSL::SSL boost_redis_src)
-endforeach()
-
-if (MSVC)
-   foreach(exe IN LISTS tests_cpp17 tests_cpp20 examples_cpp17 examples_cpp20 libs_cpp17 libs_cpp20 benchmakrs libs_common)
+foreach(exe IN LISTS tests_cpp17 tests_cpp20 examples_cpp17 examples_cpp20 libs_cpp17 libs_cpp20 libs_common benchmakrs)
+   target_link_libraries(${exe} PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+   if (MSVC)
       target_compile_options(${exe} PRIVATE /bigobj)
       target_compile_definitions(${exe} PRIVATE _WIN32_WINNT=0x0601)
-   endforeach()
-endif()
+   endif()
+endforeach()
+
+foreach(exe IN LISTS tests_cpp17 tests_cpp20 examples_cpp17 examples_cpp20 libs_cpp17 libs_cpp20 benchmakrs)
+   target_link_libraries(${exe} PRIVATE boost_redis_src)
+endforeach()
 
 foreach(exe IN LISTS tests_cpp20 examples_cpp20 libs_cpp20 benchmarks)
    target_compile_features(${exe} PUBLIC cxx_std_20)

examples/boost_redis.cpp

@@ -4,4 +4,11 @@
  * accompanying file LICENSE.txt)
  */
 
+#include <boost/redis/config.hpp>
+#include <boost/redis/connection.hpp>
+#include <boost/redis/request.hpp>
+#include <boost/asio/detached.hpp>
+#include <boost/asio/deferred.hpp>
+#include <boost/asio/consign.hpp>
+
 #include <boost/redis/src.hpp>

examples/cpp20_containers.cpp

@@ -15,12 +15,11 @@
 #if defined(BOOST_ASIO_HAS_CO_AWAIT)
 
 namespace net = boost::asio;
-namespace redis = boost::redis;
-using redis::request;
-using redis::response;
-using redis::ignore_t;
-using redis::ignore;
-using redis::config;
+using boost::redis::request;
+using boost::redis::response;
+using boost::redis::ignore_t;
+using boost::redis::ignore;
+using boost::redis::config;
 using connection = net::deferred_t::as_default_on_t<boost::redis::connection>;
 
 void print(std::map<std::string, std::string> const& cont)

examples/cpp20_json.cpp

@@ -12,6 +12,7 @@
 #include <boost/asio/consign.hpp>
 #include <string>
 #include <iostream>
+
 #if defined(BOOST_ASIO_HAS_CO_AWAIT)
 
 #define BOOST_JSON_NO_LIB
@@ -21,12 +22,12 @@
 
 namespace net = boost::asio;
 using namespace boost::describe;
-using connection = net::deferred_t::as_default_on_t<boost::redis::connection>;
 using boost::redis::request;
 using boost::redis::response;
 using boost::redis::operation;
 using boost::redis::ignore_t;
 using boost::redis::config;
+using connection = net::deferred_t::as_default_on_t<boost::redis::connection>;
 
 // Struct that will be stored in Redis using json serialization. 
 struct user {

examples/cpp20_resolve_with_sentinel.cpp

@@ -13,13 +13,12 @@
 #if defined(BOOST_ASIO_HAS_CO_AWAIT)
 
 namespace net = boost::asio;
-namespace redis = boost::redis;
 using endpoints = net::ip::tcp::resolver::results_type;
-using redis::request;
-using redis::response;
-using redis::ignore_t;
-using redis::config;
-using redis::address;
+using boost::redis::request;
+using boost::redis::response;
+using boost::redis::ignore_t;
+using boost::redis::config;
+using boost::redis::address;
 using connection = boost::asio::use_awaitable_t<>::as_default_on_t<boost::redis::connection>;
 
 auto redir(boost::system::error_code& ec)

examples/cpp20_streams.cpp

@@ -88,7 +88,7 @@ auto co_main(config cfg) -> net::awaitable<void>
    net::co_spawn(ex, stream_reader(conn), net::detached);
 
    // Disable health checks.
-   cfg.health_check_interval = std::chrono::seconds{0};
+   cfg.health_check_interval = std::chrono::seconds::zero();
    conn->async_run(cfg, {}, net::consign(net::detached, conn));
 
    signal_set sig_set(ex, SIGINT, SIGTERM);

examples/main.cpp

@@ -4,6 +4,7 @@
  * accompanying file LICENSE.txt)
  */
 
+#include <boost/redis/connection.hpp>
 #include <boost/redis/config.hpp>
 #include <boost/asio/co_spawn.hpp>
 #include <boost/asio/use_awaitable.hpp>
@@ -12,6 +13,7 @@
 
 namespace net = boost::asio;
 using boost::redis::config;
+using boost::redis::logger;
 
 #if defined(BOOST_ASIO_HAS_CO_AWAIT)
 

include/boost/redis.hpp

@@ -12,8 +12,6 @@
 #include <boost/redis/connection.hpp>
 #include <boost/redis/request.hpp>
 #include <boost/redis/response.hpp>
-#include <boost/redis/run.hpp>
-#include <boost/redis/address.hpp>
 #include <boost/redis/ignore.hpp>
 #include <boost/redis/logger.hpp>