MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 07:23:53 +01:00
Code Issues Releases Wiki Activity

ircd: Make exception.o as an asio unit for system_error interop; minor comments.

Browse source
This commit is contained in:
Jason Volk 2020-02-26 11:33:15 -08:00
parent 38aa9b6d0c
commit 72b772b530
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/ircd/asio.h
View file

@ -27,8 +27,11 @@
#define BOOST_COROUTINES_NO_DEPRECATION_WARNING
#pragma GCC visibility push(default)
// Boost preambles
#include <boost/version.hpp>
#include <boost/config.hpp>
// Workarounds / fixes
#if BOOST_VERSION >= 107000
namespace boost
{
@ -37,7 +40,10 @@ namespace boost
}
#endif
#include <boost/config.hpp>
// Needed for consistent interop with std::system_error
#include <boost/system/system_error.hpp>
// Boost ASIO stack
#include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
#include <boost/asio/steady_timer.hpp>
@ -53,7 +59,10 @@ namespace boost
/// need these low-level interfaces.
///
// Context system headers depending on boost.
#include <ircd/ctx/continuation.h>
// Network system headers depending on boost.
#include <ircd/net/asio.h>
#endif HAVE_IRCD_ASIO_H

1
ircd/Makefile.am
View file

@ -187,6 +187,7 @@ db_write_thread.lo: AM_CPPFLAGS += -I$(top_srcdir)/deps/rocksdb
db_crc32.lo: AM_CPPFLAGS := ${ROCKSDB_UNIT_CPPFLAGS} ${AM_CPPFLAGS}
db_crc32.lo: AM_CPPFLAGS += -I$(top_srcdir)/deps/rocksdb/include
db_crc32.lo: AM_CPPFLAGS += -I$(top_srcdir)/deps/rocksdb
exception.lo: AM_CPPFLAGS := ${ASIO_UNIT_CPPFLAGS} ${AM_CPPFLAGS}
fmt.lo: AM_CPPFLAGS := ${SPIRIT_UNIT_CPPFLAGS} ${AM_CPPFLAGS}
fmt.lo: AM_CXXFLAGS := ${SPIRIT_UNIT_CXXFLAGS} ${AM_CXXFLAGS}
fs.lo: AM_CPPFLAGS := ${ASIO_UNIT_CPPFLAGS} ${AM_CPPFLAGS}

2
ircd/exception.cc
View file

@ -8,8 +8,6 @@
// copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file.
#include <boost/system/system_error.hpp>
[[noreturn]] static void
ircd_terminate_handler()
noexcept