summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-07-22 21:56:40 +0000
committerEric Fiselier <eric@efcs.ca>2018-07-22 21:56:40 +0000
commit6d4be63ab137605ded5034ee40080bfb6787b914 (patch)
tree15f48bff2f3035ffeb144f9e756ff4702589c077
parent1c6bb54c567c871ae9f32e6d3c0289342a8790a8 (diff)
downloadbcm5719-llvm-6d4be63ab137605ded5034ee40080bfb6787b914.tar.gz
bcm5719-llvm-6d4be63ab137605ded5034ee40080bfb6787b914.zip
Workaround bug in GCC trunk.
For some reason GCC ToT is failing to deduce the auto type for a static data member from its initializer in some cases. Though I'm sure the bug will be short lived, there is a trivial workaround for it. So we might as well get the bot passing again. llvm-svn: 337661
-rw-r--r--libcxx/src/experimental/filesystem/filesystem_common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/src/experimental/filesystem/filesystem_common.h b/libcxx/src/experimental/filesystem/filesystem_common.h
index 0dd6e9ee438..18742830924 100644
--- a/libcxx/src/experimental/filesystem/filesystem_common.h
+++ b/libcxx/src/experimental/filesystem/filesystem_common.h
@@ -94,18 +94,18 @@ using namespace chrono;
template <class FileTimeT,
bool IsFloat = is_floating_point<typename FileTimeT::rep>::value>
struct fs_time_util_base {
- static constexpr auto max_seconds =
+ static constexpr seconds::rep max_seconds =
duration_cast<seconds>(FileTimeT::duration::max()).count();
- static constexpr auto max_nsec =
+ static constexpr nanoseconds::rep max_nsec =
duration_cast<nanoseconds>(FileTimeT::duration::max() -
seconds(max_seconds))
.count();
- static constexpr auto min_seconds =
+ static constexpr seconds::rep min_seconds =
duration_cast<seconds>(FileTimeT::duration::min()).count();
- static constexpr auto min_nsec_timespec =
+ static constexpr nanoseconds::rep min_nsec_timespec =
duration_cast<nanoseconds>(
(FileTimeT::duration::min() - seconds(min_seconds)) + seconds(1))
.count();
OpenPOWER on IntegriCloud