diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-14 20:40:18 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-14 20:40:18 +0100 |
| commit | 17739146f98241af2787b1aff50265efbe84f96f (patch) | |
| tree | 5ce7acafaf8d88c18d55f5856511b4de3a30867c | |
| parent | 9a822fc79deecdc3bad1bcca0bb1ffebdd3b404c (diff) | |
| download | gcc-17739146f98241af2787b1aff50265efbe84f96f.zip gcc-17739146f98241af2787b1aff50265efbe84f96f.tar.gz gcc-17739146f98241af2787b1aff50265efbe84f96f.tar.bz2 | |
Resolve ambiguities in std::experimental::sample test
* testsuite/experimental/algorithm/sample.cc: Qualify calls to
resolve ambiguity between std::sample and std::experimental::sample.
From-SVN: r241183
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/algorithm/sample.cc | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2ce5932..497744e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-10-14 Jonathan Wakely <jwakely@redhat.com> + * testsuite/experimental/algorithm/sample.cc: Qualify calls to + resolve ambiguity between std::sample and std::experimental::sample. + * include/std/functional (_Mu<A, false, true>, _Mu<A, true, false>): Simplify forwarding from tuple of references. (_Maybe_wrap_member_pointer): Remove. diff --git a/libstdc++-v3/testsuite/experimental/algorithm/sample.cc b/libstdc++-v3/testsuite/experimental/algorithm/sample.cc index 16e6a74..e3c25e8 100644 --- a/libstdc++-v3/testsuite/experimental/algorithm/sample.cc +++ b/libstdc++-v3/testsuite/experimental/algorithm/sample.cc @@ -28,7 +28,6 @@ std::mt19937 rng; -using std::experimental::sample; using std::istream_iterator; using std::ostream_iterator; @@ -39,7 +38,7 @@ test01() int samp[10] = { }; // population smaller than desired sample size - auto it = sample(pop, pop + 2, samp, 10, rng); + auto it = std::experimental::sample(pop, pop + 2, samp, 10, rng); VERIFY( it == samp + 2 ); VERIFY( std::accumulate(samp, samp + 10, 0) == 3 ); } @@ -50,7 +49,7 @@ test02() const int pop[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; int samp[10] = { }; - auto it = sample(pop, std::end(pop), samp, 10, rng); + auto it = std::experimental::sample(pop, std::end(pop), samp, 10, rng); VERIFY( it == samp + 10 ); std::sort(samp, it); @@ -65,7 +64,9 @@ test03() int samp[5] = { }; // input iterator for population - auto it = sample(istream_iterator<int>{pop}, {}, samp, 5, rng); + auto it = std::experimental::sample(istream_iterator<int>{pop}, {}, + samp, + 5, rng); VERIFY( it == samp + 5 ); std::sort(samp, it); @@ -80,7 +81,9 @@ test04() std::stringstream samp; // forward iterator for population and output iterator for result - sample(pop.begin(), pop.end(), ostream_iterator<int>{samp, " "}, 5, rng); + std::experimental::sample(pop.begin(), pop.end(), + ostream_iterator<int>{samp, " "}, + 5, rng); // samp.rdbuf()->pubseekoff(0, std::ios::beg); std::vector<int> v(istream_iterator<int>{samp}, {}); |