summaryrefslogtreecommitdiff
path: root/databases/foundationdb/files/patch-flow_Deque.h
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2019-04-12 13:04:58 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2019-04-12 13:04:58 +0000
commit5f0593e970ce542847deaabd7179b6e816f83169 (patch)
tree9d3ec8187e366ecb394d9820dad5da0cc77204cf /databases/foundationdb/files/patch-flow_Deque.h
parentUpdate to 1.12.1 (diff)
1: Update to 6.1.1.
2: fix building with boost 1.70. 3: remove BROKEN.
Diffstat (limited to 'databases/foundationdb/files/patch-flow_Deque.h')
-rw-r--r--databases/foundationdb/files/patch-flow_Deque.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/databases/foundationdb/files/patch-flow_Deque.h b/databases/foundationdb/files/patch-flow_Deque.h
index 5e146f57b007..d8c44c2229d4 100644
--- a/databases/foundationdb/files/patch-flow_Deque.h
+++ b/databases/foundationdb/files/patch-flow_Deque.h
@@ -1,6 +1,6 @@
---- flow/Deque.h.orig 2019-01-09 22:28:32 UTC
+--- flow/Deque.h.orig 2019-04-09 00:11:05 UTC
+++ flow/Deque.h
-@@ -166,7 +166,7 @@ class Deque { (private)
+@@ -168,7 +168,7 @@ class Deque { (private)
new (&newArr[i - begin]) T(std::move(arr[i&mask]));
arr[i&mask].~T();
}
@@ -9,7 +9,7 @@
arr = newArr;
end -= begin;
begin = 0;
-@@ -177,8 +177,8 @@ class Deque { (private)
+@@ -179,7 +179,7 @@ class Deque { (private)
for (int i = begin; i != end; i++)
arr[i&mask].~T();
if(arr)
@@ -18,6 +18,3 @@
}
};
--#endif
-\ No newline at end of file
-+#endif