summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-06-26 12:00:29 +1000
committer GitHub <noreply@github.com>2016-06-26 12:00:29 +1000
commitbbdda229ab666c1b0f010d3c401fe19ecbd28252 (patch)
treea98a4068e177121bb5a81864baa13359f95ac8eb
parent01f5ef7bc29ec69f73a0a114efae14c36f4272b8 (diff)
parentfb54827cb4fcda2685ad5e9fbb17f1dfc52cc210 (diff)
Merge pull request #999 from bradhugh/osx_chrono_fix
Fix Clang compile on OSX
-rw-r--r--src/lib/util/un7z.cpp2
-rw-r--r--src/lib/util/unzip.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util/un7z.cpp b/src/lib/util/un7z.cpp
index 4fee8d156d8..2b0f6a84edb 100644
--- a/src/lib/util/un7z.cpp
+++ b/src/lib/util/un7z.cpp
@@ -521,7 +521,7 @@ void m7z_file_impl::set_curr_modified()
{
CNtfsFileTime const &file_time(m_db.MTime.Vals[m_curr_file_idx]);
ntfs_duration const ticks((std::uint64_t(file_time.High) << 32) | std::uint64_t(file_time.Low));
- m_curr_modified = std::chrono::system_clock::from_time_t(0) + (ticks - s_ntfs_offset);
+ m_curr_modified = std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(ticks - s_ntfs_offset);
}
else
{
diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
index 4671149ba38..c11561e91e8 100644
--- a/src/lib/util/unzip.cpp
+++ b/src/lib/util/unzip.cpp
@@ -768,7 +768,7 @@ int zip_file_impl::search(std::uint32_t search_crc, const std::string &search_fi
{
ntfs_times_reader const times(tag);
ntfs_duration const ticks(times.mtime());
- m_header.modified = std::chrono::system_clock::from_time_t(0) + (ticks - s_ntfs_offset);
+ m_header.modified = std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(ticks - s_ntfs_offset);
}
}
}