From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 31 Aug 2011 10:29:31 +0000 (+0000)
Subject: chrono (operator*(const _Rep1&, const duration<>&)): Fix order of template parameters... 
X-Git-Tag: releases/gcc-4.7.0~4064
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbb45bf915039d806c7827d715b3153efc8d6105;p=thirdparty%2Fgcc.git

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

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.

From-SVN: r178374
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dac79834adcb..9fc043de4763 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 4d2241ae475e..6a087f51a2fc 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)