aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Singler <singler@ira.uka.de>2009-09-25 08:37:18 +0000
committerJohannes Singler <singler@gcc.gnu.org>2009-09-25 08:37:18 +0000
commit3b06118a0a942f43a31be199e564572e9e362dd3 (patch)
treeb7f6275ce8b086776d488d87879b77b383afa1a5
parentda8d2b60561eff7e9abdbfd6fe12f21f74aefd58 (diff)
downloadgcc-3b06118a0a942f43a31be199e564572e9e362dd3.zip
gcc-3b06118a0a942f43a31be199e564572e9e362dd3.tar.gz
gcc-3b06118a0a942f43a31be199e564572e9e362dd3.tar.bz2
base.h: Comment on presence of min/max duplicates.
2009-09-25 Johannes Singler <singler@ira.uka.de> * include/parallel/base.h: Comment on presence of min/max duplicates. From-SVN: r152161
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/parallel/base.h7
2 files changed, 7 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 963b874..cf5d185 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2009-09-25 Johannes Singler <singler@ira.uka.de>
+ * include/parallel/base.h: Comment on presence of min/max duplicates.
+
+2009-09-25 Johannes Singler <singler@ira.uka.de>
+
* include/parallel/partition.h (__parallel_nth_element):
Correct comment.
diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h
index b70c733..21c3548 100644
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -88,14 +88,11 @@ namespace __gnu_parallel
return __i > 1 ? __i : 1;
}
-
+
inline bool
__is_parallel(const _Parallelism __p) { return __p != sequential; }
- // XXX remove std::duplicates from here if possible,
- // XXX but keep minimal dependencies.
-
/** @brief Calculates the rounded-down logarithm of @__c __n for base 2.
* @param __n Argument.
* @return Returns 0 for any argument <1.
@@ -139,6 +136,8 @@ decode2(_CASable __x, int& __a, int& __b)
__b = (int)((__x >> 0 ) & _CASable_mask);
}
+//needed for parallel "numeric", even if "algorithm" not included
+
/** @brief Equivalent to std::min. */
template<typename _Tp>
const _Tp&