woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #148 from boryspoplawski/master

Browse Source 
Fix compilation errors on old gcc (5.4.0)
This commit is contained in:
robertswiecki 2020-08-03 22:42:28 +02:00 committed by GitHub
commit 13f3ef0a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nsjail.cc
View File

@ -166,7 +166,9 @@ static bool pipeTraffic(nsjconf_t* nsjconf, int listenfd) {
const char* direction; const char* direction;
bool closed = false; bool closed = false;
std::tuple<int, int, const char*> direction_map[] = { std::tuple<int, int, const char*> direction_map[] = {
{i, i + 1, "in"}, {i + 2, i, "out"}}; std::make_tuple(i, i + 1, "in"),
std::make_tuple(i + 2, i, "out"),
};
for (const auto& entry : direction_map) { for (const auto& entry : direction_map) {
std::tie(in, out, direction) = entry; std::tie(in, out, direction) = entry;
bool in_ready = (fds[in].events & POLLIN) == 0 || bool in_ready = (fds[in].events & POLLIN) == 0 ||