From: Johannes Singler Date: Fri, 25 Sep 2009 08:37:18 +0000 (+0000) Subject: base.h: Comment on presence of min/max duplicates. X-Git-Tag: releases/gcc-4.5.0~3271 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b06118a0a942f43a31be199e564572e9e362dd3;p=thirdparty%2Fgcc.git base.h: Comment on presence of min/max duplicates. 2009-09-25 Johannes Singler * include/parallel/base.h: Comment on presence of min/max duplicates. From-SVN: r152161 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 963b874a4d2d..cf5d185c59d9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2009-09-25 Johannes Singler + + * include/parallel/base.h: Comment on presence of min/max duplicates. + 2009-09-25 Johannes Singler * include/parallel/partition.h (__parallel_nth_element): diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h index b70c73376869..21c354829d1a 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 const _Tp&