diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/median.cc | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3334c13e13d..4500583420a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2010-02-15 Paolo Carlini <paolo.carlini@oracle.com> + * testsuite/ext/median.cc: Adjust. + +2010-02-15 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/stl_algo.h (__median): Move... * include/ext/algorithm: ... here, being an SGI extension. diff --git a/libstdc++-v3/testsuite/ext/median.cc b/libstdc++-v3/testsuite/ext/median.cc index 1c3798d59c5..fe220d8ad42 100644 --- a/libstdc++-v3/testsuite/ext/median.cc +++ b/libstdc++-v3/testsuite/ext/median.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -17,7 +17,7 @@ // median - SGI extension -#include <algorithm> +#include <ext/algorithm> #include <testsuite_hooks.h> bool pred(const int& l, const int& r) @@ -25,9 +25,9 @@ bool pred(const int& l, const int& r) return l<r; } -using std::__median; +using __gnu_cxx::__median; -int main(void) +int main() { const int i=1; const int j=2; |