aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/experimental/functional3
2 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a47781c..6808613 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2016-07-14 Jonathan Wakely <jwakely@redhat.com>
+ * include/experimental/functional: Include <parallel/algorithm> in
+ Parallel Mode.
+
* testsuite/experimental/functional/searchers.cc: Include <algorithm>
for std::search.
diff --git a/libstdc++-v3/include/experimental/functional b/libstdc++-v3/include/experimental/functional
index 2095310..ed41f5a 100644
--- a/libstdc++-v3/include/experimental/functional
+++ b/libstdc++-v3/include/experimental/functional
@@ -42,6 +42,9 @@
#include <vector>
#include <array>
#include <bits/stl_algo.h>
+#ifdef _GLIBCXX_PARALLEL
+# include <parallel/algorithm> // For std::__parallel::search
+#endif
namespace std _GLIBCXX_VISIBILITY(default)
{