jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #317: Make use of ASIO_STANDALONE when using standalone asio in order to compile on older asio versions without boost

Browse source
This commit is contained in:
eidheim 2021-03-26 10:02:04 +01:00
commit 1bb89e1e8e
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -21,7 +21,7 @@ target_link_libraries(simple-web-server INTERFACE ${CMAKE_THREAD_LIBS_INIT})
# TODO 2020 when Debian Jessie LTS ends: # TODO 2020 when Debian Jessie LTS ends:
# Remove Boost system, thread, regex components; use Boost::<component> aliases; remove Boost target_include_directories # Remove Boost system, thread, regex components; use Boost::<component> aliases; remove Boost target_include_directories
if(USE_STANDALONE_ASIO) if(USE_STANDALONE_ASIO)
target_compile_definitions(simple-web-server INTERFACE USE_STANDALONE_ASIO) target_compile_definitions(simple-web-server INTERFACE ASIO_STANDALONE)
find_path(ASIO_PATH asio.hpp) find_path(ASIO_PATH asio.hpp)
if(NOT ASIO_PATH) if(NOT ASIO_PATH)
message(FATAL_ERROR "Standalone Asio not found") message(FATAL_ERROR "Standalone Asio not found")

4
asio_compatibility.hpp
View file

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#ifdef USE_STANDALONE_ASIO #ifdef ASIO_STANDALONE
#include <asio.hpp> #include <asio.hpp>
#include <asio/steady_timer.hpp> #include <asio/steady_timer.hpp>
namespace SimpleWeb { namespace SimpleWeb {
@ -27,7 +27,7 @@ namespace SimpleWeb {
#endif #endif
namespace SimpleWeb { namespace SimpleWeb {
#if(USE_STANDALONE_ASIO && ASIO_VERSION >= 101300) || BOOST_ASIO_VERSION >= 101300 #if(ASIO_STANDALONE && ASIO_VERSION >= 101300) || BOOST_ASIO_VERSION >= 101300
using io_context = asio::io_context; using io_context = asio::io_context;
using resolver_results = asio::ip::tcp::resolver::results_type; using resolver_results = asio::ip::tcp::resolver::results_type;
using async_connect_endpoint = asio::ip::tcp::endpoint; using async_connect_endpoint = asio::ip::tcp::endpoint;

4
client_http.hpp
View file

@ -50,14 +50,14 @@ namespace SimpleWeb {
} }
}; };
} // namespace SimpleWeb } // namespace SimpleWeb
#ifndef USE_STANDALONE_ASIO #ifndef ASIO_STANDALONE
namespace boost { namespace boost {
#endif #endif
namespace asio { namespace asio {
template <> template <>
struct is_match_condition<SimpleWeb::HeaderEndMatch> : public std::true_type {}; struct is_match_condition<SimpleWeb::HeaderEndMatch> : public std::true_type {};
} // namespace asio } // namespace asio
#ifndef USE_STANDALONE_ASIO #ifndef ASIO_STANDALONE
} // namespace boost } // namespace boost
#endif #endif

2
client_https.hpp
View file

@ -3,7 +3,7 @@
#include "client_http.hpp" #include "client_http.hpp"
#ifdef USE_STANDALONE_ASIO #ifdef ASIO_STANDALONE
#include <asio/ssl.hpp> #include <asio/ssl.hpp>
#else #else
#include <boost/asio/ssl.hpp> #include <boost/asio/ssl.hpp>

2
server_https.hpp
View file

@ -3,7 +3,7 @@
#include "server_http.hpp" #include "server_http.hpp"
#ifdef USE_STANDALONE_ASIO #ifdef ASIO_STANDALONE
#include <asio/ssl.hpp> #include <asio/ssl.hpp>
#else #else
#include <boost/asio/ssl.hpp> #include <boost/asio/ssl.hpp>

2
utility.hpp
View file

@ -27,7 +27,7 @@
namespace SimpleWeb { namespace SimpleWeb {
using string_view = std::string_view; using string_view = std::string_view;
} }
#elif !defined(USE_STANDALONE_ASIO) #elif !defined(ASIO_STANDALONE)
#include <boost/utility/string_ref.hpp> #include <boost/utility/string_ref.hpp>
namespace SimpleWeb { namespace SimpleWeb {
using string_view = boost::string_ref; using string_view = boost::string_ref;