diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-04-11 11:47:19 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2015-04-11 11:47:19 +0000 |
| commit | d4150a09555b44de9696dd4ed11991c12c024ba8 (patch) | |
| tree | 0d6ed12831e14499c9a6b6cc00522ba2b123d8e5 | |
| parent | ca12db4441eab3b3b8ec9436cf2d07d172c70c95 (diff) | |
PR libstdc++/65499
* include/std/chrono: Add using-directive for literals to std::chrono.
* testsuite/20_util/duration/literals/65499.cc: New.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@222004 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/chrono | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/duration/literals/65499.cc | 26 |
3 files changed, 42 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ef8e9649009..645727f9def 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,13 @@ 2015-04-11 Jonathan Wakely <jwakely@redhat.com> Backport from mainline + 2015-03-27 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/65499 + * include/std/chrono: Add using-directive for literals to std::chrono. + * testsuite/20_util/duration/literals/65499.cc: New. + + Backport from mainline 2015-03-26 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/58038 diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 6e9c7dc9715..e546ab98e3a 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -904,6 +904,15 @@ _GLIBCXX_END_NAMESPACE_VERSION } // inline namespace chrono_literals } // inline namespace literals + namespace chrono + { + _GLIBCXX_BEGIN_NAMESPACE_VERSION + + using namespace literals::chrono_literals; + + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace chrono + #endif // __cplusplus > 201103L // @} group chrono diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc b/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc new file mode 100644 index 00000000000..62c4f5a7b59 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc @@ -0,0 +1,26 @@ +// Copyright (C) 2015 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// PR libstdc++/65499 + +#include <chrono> + +using namespace std::chrono; +minutes min = 36min; |