summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2018-07-25 23:59:54 +0000
committerAlex Lorenz <arphaman@gmail.com>2018-07-25 23:59:54 +0000
commit70cf5c4c62afc3ac9de5fbcd5ac1a88aed14a9d0 (patch)
tree0596ac274a4f5d16923216abbff2981da4a8ac03 /libcxx/src
parent31cc0846192591dc4b2c99b8f2cdf12901624f3f (diff)
downloadbcm5719-llvm-70cf5c4c62afc3ac9de5fbcd5ac1a88aed14a9d0.tar.gz
bcm5719-llvm-70cf5c4c62afc3ac9de5fbcd5ac1a88aed14a9d0.zip
[libc++] Follow-up to r337968: use an explicit cast as suggested by Eric
llvm-svn: 337984
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/experimental/filesystem/filesystem_common.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/src/experimental/filesystem/filesystem_common.h b/libcxx/src/experimental/filesystem/filesystem_common.h
index a74cae457ec..5d2a5ed4e3a 100644
--- a/libcxx/src/experimental/filesystem/filesystem_common.h
+++ b/libcxx/src/experimental/filesystem/filesystem_common.h
@@ -393,8 +393,10 @@ bool set_file_times(const path& p, std::array<TimeSpec, 2> const& TS,
error_code& ec) {
#if !defined(_LIBCPP_USE_UTIMENSAT)
using namespace chrono;
- auto Convert = [](long nsec) -> decltype(std::declval<::timeval>().tv_usec) {
- return duration_cast<microseconds>(nanoseconds(nsec)).count();
+ auto Convert = [](long nsec) {
+ using int_type = decltype(std::declval<::timeval>().tv_usec);
+ auto dur = duration_cast<microseconds>(nanoseconds(nsec)).count();
+ return static_cast<int_type>(dur);
};
struct ::timeval ConvertedTS[2] = {{TS[0].tv_sec, Convert(TS[0].tv_nsec)},
{TS[1].tv_sec, Convert(TS[1].tv_nsec)}};
OpenPOWER on IntegriCloud