MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-12 04:51:08 +01:00
Code Issues Releases Wiki Activity

ircd: Clang-7 related misc fixes.

Browse source
This commit is contained in:
Jason Volk 2019-07-19 16:41:31 -07:00
parent df5f00d145
commit 431eff54d9
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ircd/base.cc
View file

@ -12,7 +12,7 @@
#include <boost/archive/iterators/binary_from_base64.hpp> #include <boost/archive/iterators/binary_from_base64.hpp>
#include <boost/archive/iterators/transform_width.hpp> #include <boost/archive/iterators/transform_width.hpp>
namespace __attribute__((visibility("internal"))) ircd namespace [[gnu::visibility("hidden")]] ircd
{ {
thread_local char base_conv_tmp_buf[64_KiB]; thread_local char base_conv_tmp_buf[64_KiB];
} }

3
ircd/ctx_ole.cc
View file

@ -91,7 +91,8 @@ ircd::ctx::ole::offload::offload(const opts &opts,
// we don't care about eptr anyway. // we don't care about eptr anyway.
const uninterruptible uninterruptible; const uninterruptible uninterruptible;
push(std::move(closure)); do // scope address required for clang-7
ole::push(std::move(closure)); do
{ {
wait(); wait();
} }

24
ircd/openssl.cc
View file

@ -2288,9 +2288,12 @@ noexcept try
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log::critical("OpenSSL thread id callback (tid=%p): %s", log::critical
(const void *)tid, {
e.what()); "OpenSSL thread id callback (tid=%p): %s",
(const void *)tid,
e.what()
};
ircd::terminate(); ircd::terminate();
} }
@ -2302,7 +2305,11 @@ ircd::openssl::locking::callback(const int mode,
const int line) const int line)
noexcept try noexcept try
{ {
log::debug("OpenSSL: %s", debug(mode, num, file, line)); log::debug
{
"OpenSSL: %s",
debug(mode, num, file, line)
};
auto &mutex auto &mutex
{ {
@ -2321,9 +2328,12 @@ noexcept try
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log::critical("OpenSSL locking callback (%s): %s", log::critical
debug(mode, num, file, line), {
e.what()); "OpenSSL locking callback (%s): %s",
debug(mode, num, file, line),
e.what()
};
ircd::terminate(); ircd::terminate();
} }