https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69464
--- Comment #13 from Jonathan Wakely <redi at gcc dot gnu.org> --- Author: redi Date: Wed Apr 20 13:00:24 2016 New Revision: 235276 URL: https://gcc.gnu.org/viewcvs?rev=235276&root=gcc&view=rev Log: Avoid including all of <random> in <algorithm> Backport from mainline 2016-01-25 Jonathan Wakely <jwak...@redhat.com> PR libstdc++/69464 * include/Makefile.am: Add new header. * include/Makefile.in: Regenerate. * include/bits/random.h (uniform_int_distribution): Move to bits/uniform_int_dist.h. * include/bits/random.tcc (uniform_int_distribution::operator(), uniform_int_distribution::__generate_impl): Likewise. * include/bits/uniform_int_dist.h: New header. * include/bits/stl_algo.h [__cplusplus >= 201103L]: Include <bits/uniform_int_dist.h> instead of <random>. * testsuite/20_util/specialized_algorithms/uninitialized_copy/ move_iterators/1.cc: Include correct header for uninitialized_copy. * testsuite/20_util/specialized_algorithms/uninitialized_copy_n/ move_iterators/1.cc: Likewise. * testsuite/25_algorithms/nth_element/58800.cc: Include correct header for vector. * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error lines. * testsuite/libstdc++-prettyprinters/whatis.cc: Include <random>. Added: branches/gcc-5-branch/libstdc++-v3/include/bits/uniform_int_dist.h Modified: branches/gcc-5-branch/libstdc++-v3/ChangeLog branches/gcc-5-branch/libstdc++-v3/include/Makefile.am branches/gcc-5-branch/libstdc++-v3/include/Makefile.in branches/gcc-5-branch/libstdc++-v3/include/bits/random.h branches/gcc-5-branch/libstdc++-v3/include/bits/random.tcc branches/gcc-5-branch/libstdc++-v3/include/bits/stl_algo.h branches/gcc-5-branch/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc branches/gcc-5-branch/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc branches/gcc-5-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc branches/gcc-5-branch/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc branches/gcc-5-branch/libstdc++-v3/testsuite/libstdc++-prettyprinters/whatis.cc