diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-10-05 21:18:32 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-10-05 21:18:32 +0000 |
| commit | 3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d (patch) | |
| tree | 90f35f5c736690e54a2ab63203a43e6e9d262f9a /libcxx/include/chrono | |
| parent | c81e29435ab4ea1e44c6b8301bae3e4bdef821d9 (diff) | |
| download | bcm5719-llvm-3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d.tar.gz bcm5719-llvm-3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d.zip | |
Mark namespaces for user defined literals as 'inline'
llvm-svn: 192047
Diffstat (limited to 'libcxx/include/chrono')
| -rw-r--r-- | libcxx/include/chrono | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libcxx/include/chrono b/libcxx/include/chrono index afc51817007..2c65eee7d06 100644 --- a/libcxx/include/chrono +++ b/libcxx/include/chrono @@ -942,12 +942,9 @@ typedef steady_clock high_resolution_clock; } // chrono -#if _LIBCPP_STD_VER > 11 -// Literal suffixes for chrono types -// inline // Deviation from N3690. -// We believe the inline to be a defect and have submitted an LWG issue. -// An LWG issue number has not yet been assigned. -namespace literals +#if _LIBCPP_STD_VER > 11 +// Suffixes for duration literals [time.duration.literals] +inline namespace literals { inline namespace chrono_literals { @@ -1018,6 +1015,11 @@ namespace literals } }} + +namespace chrono { // hoist the literals into namespace std::chrono + using namespace literals::chrono_literals; +} + #endif _LIBCPP_END_NAMESPACE_STD |
