Revert r344529 "Implement the first part of the calendar support for C++20"

Revert r344535 "Wrap up the new chrono literals in an #ifdef..."
Revert r344546 "Mark a couple of test cases as 'C++17-only'..."

Some of the buildbot failures were masked by another error,
and this one was probably missed.

llvm-svn: 344580

3 files changed, 0 insertions, 88 deletions

diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
index 5d5fb2ad4bc..d5c0207c0ee 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
@@ -14,8 +14,6 @@
 #include <type_traits>
 #include <cassert>
 
-#include "test_macros.h"
-
 int main()
 {
     using namespace std::literals::chrono_literals;
@@ -27,31 +25,6 @@ int main()
     static_assert ( std::is_same<decltype( 3ms  ), std::chrono::milliseconds>::value, "" );
     static_assert ( std::is_same<decltype( 3us  ), std::chrono::microseconds>::value, "" );
     static_assert ( std::is_same<decltype( 3ns  ), std::chrono::nanoseconds>::value, "" );
-#if TEST_STD_VER > 17
-//     static_assert ( std::is_same<decltype( Sunday ),    std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Monday ),    std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Tuesday ),   std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Wednesday ), std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Thursday ),  std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Friday ),    std::chrono::weekday>::value, "" );
-//     static_assert ( std::is_same<decltype( Saturday ),  std::chrono::weekday>::value, "" );
-// 
-//     static_assert ( std::is_same<decltype( January ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( February ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( March ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( April ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( May ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( June ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( July ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( August ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( September ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( October ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( November ), std::chrono::month>::value, "" );
-//     static_assert ( std::is_same<decltype( December ), std::chrono::month>::value, "" );
-
-//     static_assert ( std::is_same<decltype( 4d    ), std::chrono::days>::value, "" );
-//     static_assert ( std::is_same<decltype( 2016y ), std::chrono::years>::value, "" );
-#endif
 
     std::chrono::hours h = 4h;
     assert ( h == std::chrono::hours(4));
@@ -82,32 +55,4 @@ int main()
     assert ( ns == std::chrono::nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-
-
-#if TEST_STD_VER > 17
-//  assert(std::chrono::Sunday    == std::chrono::weekday(0));
-//  assert(std::chrono::Monday    == std::chrono::weekday(1));
-//  assert(std::chrono::Tuesday   == std::chrono::weekday(2));
-//  assert(std::chrono::Wednesday == std::chrono::weekday(3));
-//  assert(std::chrono::Thursday  == std::chrono::weekday(4));
-//  assert(std::chrono::Friday    == std::chrono::weekday(5));
-//  assert(std::chrono::Saturday  == std::chrono::weekday(6));
-
-	assert(std::chrono::January   == std::chrono::month(1));
-	assert(std::chrono::February  == std::chrono::month(2));
-	assert(std::chrono::March     == std::chrono::month(3));
-	assert(std::chrono::April     == std::chrono::month(4));
-	assert(std::chrono::May       == std::chrono::month(5));
-	assert(std::chrono::June      == std::chrono::month(6));
-	assert(std::chrono::July      == std::chrono::month(7));
-	assert(std::chrono::August    == std::chrono::month(8));
-	assert(std::chrono::September == std::chrono::month(9));
-	assert(std::chrono::October   == std::chrono::month(10));
-	assert(std::chrono::November  == std::chrono::month(11));
-	assert(std::chrono::December  == std::chrono::month(12));
-
-    std::chrono::year y1 = 2018y;
-    assert (y1 == std::chrono::year(2018));
-//  No conversion from floating point for years
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
index 33a89bf0674..5e59e115378 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
@@ -45,31 +45,4 @@ int main()
     assert ( ns == nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-
-#if TEST_STD_VER > 17
-    assert(Sunday    == weekday(0));
-    assert(Monday    == weekday(1));
-    assert(Tuesday   == weekday(2));
-    assert(Wednesday == weekday(3));
-    assert(Thursday  == weekday(4));
-    assert(Friday    == weekday(5));
-    assert(Saturday  == weekday(6));
-
-    assert(January   == month(1));
-    assert(February  == month(2));
-    assert(March     == month(3));
-    assert(April     == month(4));
-    assert(May       == month(5));
-    assert(June      == month(6));
-    assert(July      == month(7));
-    assert(August    == month(8));
-    assert(September == month(9));
-    assert(October   == month(10));
-    assert(November  == month(11));
-    assert(December  == month(12));
-
-    year y1 = 2018y;
-    assert (y1 == year(2018));
-//  No conversion from floating point for years
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
index 1d2b5ad2348..282b1c6572e 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
@@ -47,10 +47,4 @@ int main()
     assert ( ns == std::chrono::nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-
-#if TEST_STD_VER > 17
-    std::chrono::year y1 = 2018y;
-    assert (y1 == std::chrono::year(2018));
-//  No conversion from floating point for years
-#endif
 }