summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2019-09-23 06:16:41 +0000
committerMarshall Clow <mclow.lists@gmail.com>2019-09-23 06:16:41 +0000
commitab8f77a73e5407b07743f1e352853e7b7c4fde6c (patch)
tree24ef7133eb2846ce53eaf1e4fd0a1c7509de6e4e
parent03b5a13ee32e577346dae13df86f29dd0e75580f (diff)
downloadbcm5719-llvm-ab8f77a73e5407b07743f1e352853e7b7c4fde6c.tar.gz
bcm5719-llvm-ab8f77a73e5407b07743f1e352853e7b7c4fde6c.zip
Revert "Extension: Mark the default constructor of chrono::duration as conditionally noexcept"; this breaks the gcc5 bot for C++11
This reverts commit c8ca15c95c4c0d6d1356500d5fe49a319ea4ca01. llvm-svn: 372546
-rw-r--r--libcxx/include/chrono2
-rw-r--r--libcxx/test/libcxx/utilities/time/date.time/duration.noexcept.pass.cpp47
2 files changed, 1 insertions, 48 deletions
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index a3d1e1a1187..0e4cf9aef3a 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -1063,7 +1063,7 @@ public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
#ifndef _LIBCPP_CXX03_LANG
- duration() noexcept(noexcept(_Rep())) = default;
+ duration() = default;
#else
duration() {}
#endif
diff --git a/libcxx/test/libcxx/utilities/time/date.time/duration.noexcept.pass.cpp b/libcxx/test/libcxx/utilities/time/date.time/duration.noexcept.pass.cpp
deleted file mode 100644
index b9d443fd97a..00000000000
--- a/libcxx/test/libcxx/utilities/time/date.time/duration.noexcept.pass.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// Libc++ adds noexcept to the default constructor to std::chrono::duration
-// when the underlying type is noexcept default constructible. This makes all
-// the standard durations noexcept default constructible.
-
-// typedef duration<long long, nano> nanoseconds;
-// typedef duration<long long, micro> microseconds;
-// typedef duration<long long, milli> milliseconds;
-// typedef duration<long long > seconds;
-// typedef duration< long, ratio< 60> > minutes;
-// typedef duration< long, ratio<3600> > hours;
-//
-// #if _LIBCPP_STD_VER > 17
-// typedef duration< int, ratio_multiply<ratio<24>, hours::period>> days;
-// typedef duration< int, ratio_multiply<ratio<7>, days::period>> weeks;
-// typedef duration< int, ratio_multiply<ratio<146097, 400>, days::period>> years;
-// typedef duration< int, ratio_divide<years::period, ratio<12>>> months;
-// #endif
-
-#include <chrono>
-
-#include "test_macros.h"
-
-int main(int, char**) {
-
- ASSERT_NOEXCEPT(std::chrono::nanoseconds());
- ASSERT_NOEXCEPT(std::chrono::microseconds());
- ASSERT_NOEXCEPT(std::chrono::milliseconds());
- ASSERT_NOEXCEPT(std::chrono::seconds());
- ASSERT_NOEXCEPT(std::chrono::minutes());
- ASSERT_NOEXCEPT(std::chrono::hours());
-
-#if TEST_STD_VER > 17
- ASSERT_NOEXCEPT(std::chrono::days());
- ASSERT_NOEXCEPT(std::chrono::weeks());
- ASSERT_NOEXCEPT(std::chrono::years());
- ASSERT_NOEXCEPT(std::chrono::months());
-#endif
-
- return 0;
-}
OpenPOWER on IntegriCloud