diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-19 02:17:35 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-19 02:17:35 +0000 |
| commit | 5e475603f6fc3b0a63794f4fe47f198a940ce06f (patch) | |
| tree | 87c3cd9f80227ff302184790e350980ae5708c57 /libstdc++-v3/include/std | |
| parent | 11aa6251ecf5eb0234617569b7044b9f1878c837 (diff) | |
| download | gcc-5e475603f6fc3b0a63794f4fe47f198a940ce06f.tar.gz | |
2011-01-18 Benjamin Kosnik <bkoz@redhat.com>
* doc/xml/images/confdeps.png: Regenerate.
* include/std/chrono (duration): Mark copy constructor constexpr.
* testsuite/20_util/duration/cons/constexpr.cc: Add test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168979 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/chrono | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 25110817a15..b93671f3855 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -1,6 +1,6 @@ // <chrono> -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 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 @@ -223,6 +223,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 20.8.3.1 construction / copy / destroy constexpr duration() : __r() { } + constexpr duration(const duration&) = default; + template<typename _Rep2, typename = typename enable_if<is_convertible<_Rep2, rep>::value && (treat_as_floating_point<rep>::value @@ -238,7 +240,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) : __r(duration_cast<duration>(__d).count()) { } ~duration() = default; - duration(const duration&) = default; duration& operator=(const duration&) = default; // 20.8.3.2 observer |