diff options
| author | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 21:14:38 +0000 |
|---|---|---|
| committer | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 21:14:38 +0000 |
| commit | c59e585126d36051c0913d432ff224ef97a8583e (patch) | |
| tree | 29df22bc373e286d0dced7be57170e3aef25cb16 /libcxx/src | |
| parent | 726d6a12ad6ee2942a5de304ffd994f38e6cfb26 (diff) | |
| download | bcm5719-llvm-c59e585126d36051c0913d432ff224ef97a8583e.tar.gz bcm5719-llvm-c59e585126d36051c0913d432ff224ef97a8583e.zip | |
Partially address a FIXME in steady_clock::now()
http://reviews.llvm.org/D4045
llvm-svn: 216949
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/chrono.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp index 15a6f466a77..83661b0626d 100644 --- a/libcxx/src/chrono.cpp +++ b/libcxx/src/chrono.cpp @@ -46,6 +46,7 @@ system_clock::from_time_t(time_t t) _NOEXCEPT return system_clock::time_point(seconds(t)); } +#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK // steady_clock const bool steady_clock::is_steady; @@ -127,6 +128,8 @@ steady_clock::now() _NOEXCEPT } #endif // __APPLE__ +#endif // !_LIBCPP_HAS_NO_MONOTONIC_CLOCK + } _LIBCPP_END_NAMESPACE_STD |
