From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 31 Aug 2011 10:29:31 +0000 (+0000)
Subject: 2011-08-31  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Tag: upstream/4.9.2~18036
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=724fb3f63d14e08514603b57b9147b46b4c5f746;p=platform%2Fupstream%2Flinaro-gcc.git

2011-08-31  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/chrono (operator*(const _Rep1&, const duration<>&)):
	Fix order of template parameters per LWG 2004.


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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dac7983..9fc043d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/std/chrono (operator*(const _Rep1&, const duration<>&)):
+	Fix order of template parameters per LWG 2004.
+
 2011-08-30  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/stl_iterator.h (make_move_iterator): Implement DR2061.
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index 4d2241a..6a087f5 100644
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -395,7 +395,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
 	return __cd(__cd(__d).count() * __s);
       }
 
-    template<typename _Rep1, typename _Period, typename _Rep2>
+    template<typename _Rep1, typename _Rep2, typename _Period>
       constexpr
       duration<typename __common_rep_type<_Rep2, _Rep1>::type, _Period>
       operator*(const _Rep1& __s, const duration<_Rep2, _Period>& __d)