aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2011-08-31 10:29:31 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2011-08-31 10:29:31 +0000
commitdbb45bf915039d806c7827d715b3153efc8d6105 (patch)
treeaac1f4fbcb138edce1021e4665c8fc5973ae13be /libstdc++-v3
parent24c3410793758740d3b4e3a45476a7a9e6f20724 (diff)
downloadgcc-dbb45bf915039d806c7827d715b3153efc8d6105.zip
gcc-dbb45bf915039d806c7827d715b3153efc8d6105.tar.gz
gcc-dbb45bf915039d806c7827d715b3153efc8d6105.tar.bz2
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/chrono2
2 files changed, 6 insertions, 1 deletions
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)