mirror of https://github.com/oxen-io/lokinet
Use the right version of clang-tidy
This commit is contained in:
parent
cf3a31fdd0
commit
40aabd6d92
|
@ -8,13 +8,13 @@ matrix:
|
|||
- os: linux
|
||||
dist: xenial
|
||||
compiler: gcc
|
||||
env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-7/bin:$PATH"
|
||||
env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-8/bin:$PATH"
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- llvm-toolchain-xenial-7
|
||||
- llvm-toolchain-xenial-8
|
||||
packages:
|
||||
- clang-format-7
|
||||
- clang-format-8
|
||||
- os: linux
|
||||
dist: xenial
|
||||
compiler: gcc
|
||||
|
|
|
@ -633,16 +633,17 @@ namespace libuv
|
|||
Loop::CloseAll()
|
||||
{
|
||||
llarp::LogInfo("Closing all handles");
|
||||
uv_walk(m_Impl.get(),
|
||||
[](uv_handle_t* h, void*) {
|
||||
if(uv_is_closing(h))
|
||||
return;
|
||||
if(h->data && uv_is_active(h))
|
||||
{
|
||||
static_cast< glue* >(h->data)->Close();
|
||||
}
|
||||
},
|
||||
nullptr);
|
||||
uv_walk(
|
||||
m_Impl.get(),
|
||||
[](uv_handle_t* h, void*) {
|
||||
if(uv_is_closing(h))
|
||||
return;
|
||||
if(h->data && uv_is_active(h))
|
||||
{
|
||||
static_cast< glue* >(h->data)->Close();
|
||||
}
|
||||
},
|
||||
nullptr);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -164,14 +164,15 @@ namespace llarp
|
|||
HopHandler_ptr
|
||||
PathContext::GetByUpstream(const RouterID& remote, const PathID_t& id)
|
||||
{
|
||||
auto own = MapGet(m_OurPaths, id,
|
||||
[](const PathSet_ptr) -> bool {
|
||||
// TODO: is this right?
|
||||
return true;
|
||||
},
|
||||
[remote, id](PathSet_ptr p) -> HopHandler_ptr {
|
||||
return p->GetByUpstream(remote, id);
|
||||
});
|
||||
auto own = MapGet(
|
||||
m_OurPaths, id,
|
||||
[](const PathSet_ptr) -> bool {
|
||||
// TODO: is this right?
|
||||
return true;
|
||||
},
|
||||
[remote, id](PathSet_ptr p) -> HopHandler_ptr {
|
||||
return p->GetByUpstream(remote, id);
|
||||
});
|
||||
if(own)
|
||||
return own;
|
||||
|
||||
|
|
Loading…
Reference in New Issue