From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 15 Feb 2010 17:35:11 +0000 (+0000)
Subject: 2010-02-15  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Tag: upstream/4.9.2~31029
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b04e3bd9745bea7e3d8595d8741477caf714cd8e;p=platform%2Fupstream%2Flinaro-gcc.git

2010-02-15  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/ext/median.cc: Adjust.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156780 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3334c13..4500583 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 1c3798d..fe220d8 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;