projects
/
platform
/
upstream
/
nsjail.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ca0657
)
Fix compilation errors on old gcc (5.4.0)
author
borysp
<borysp@invisiblethingslab.com>
Wed, 29 Jul 2020 13:18:10 +0000
(15:18 +0200)
committer
borysp
<borysp@invisiblethingslab.com>
Wed, 29 Jul 2020 13:18:10 +0000
(15:18 +0200)
nsjail.cc
patch
|
blob
|
history
diff --git
a/nsjail.cc
b/nsjail.cc
index 5379411f95f451957654ccda418f3302635ede69..06acf9c5f98a1d898bebbdaa9bfe0d4ec229f358 100644
(file)
--- a/
nsjail.cc
+++ b/
nsjail.cc
@@
-166,7
+166,9
@@
static bool pipeTraffic(nsjconf_t* nsjconf, int listenfd) {
const char* direction;
bool closed = false;
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) {
std::tie(in, out, direction) = entry;
bool in_ready = (fds[in].events & POLLIN) == 0 ||