aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2017-01-02 18:41:50 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2017-01-02 18:41:50 +0000
commitd1c346a43ba44f1e5ad2d0d0d9b94e835d221ae6 (patch)
tree21681414985a6f85785ba1bfe5c1d7e98c90d571
parent8bcade547a7be1aa81e9ed2c81b3e120d6a620bb (diff)
downloadllvm-d1c346a43ba44f1e5ad2d0d0d9b94e835d221ae6.zip
llvm-d1c346a43ba44f1e5ad2d0d0d9b94e835d221ae6.tar.gz
llvm-d1c346a43ba44f1e5ad2d0d0d9b94e835d221ae6.tar.bz2
chrono: correct the units for the epoch bias
As pointed out by Howard, this is actually 134774 days (* 24 * 3600), and therefore seconds, not 100ns units. Adjust the units to reflect reality. llvm-svn: 290824
-rw-r--r--libcxx/src/chrono.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
index b9d6bf9..28cdb9d 100644
--- a/libcxx/src/chrono.cpp
+++ b/libcxx/src/chrono.cpp
@@ -53,8 +53,7 @@ system_clock::now() _NOEXCEPT
nanoseconds::period>>;
// The Windows epoch is Jan 1 1601, the Unix epoch Jan 1 1970.
- static _LIBCPP_CONSTEXPR const filetime_duration
- nt_to_unix_epoch{11644473600};
+ static _LIBCPP_CONSTEXPR const seconds nt_to_unix_epoch{11644473600};
FILETIME ft;
#if _WIN32_WINNT >= _WIN32_WINNT_WIN8