[libcxx] r187903 - Rename time.duration.literals step 1
Howard Hinnant
hhinnant at apple.com
Wed Aug 7 12:35:46 PDT 2013
Author: hhinnant
Date: Wed Aug 7 14:35:46 2013
New Revision: 187903
URL: http://llvm.org/viewvc/llvm-project?rev=187903&view=rev
Log:
Rename time.duration.literals step 1
Added:
libcxx/trunk/test/utilities/time/time.duration/literals.pass.cpp
- copied, changed from r187901, libcxx/trunk/test/utilities/time/time.duration/time.duration.literals
Removed:
libcxx/trunk/test/utilities/time/time.duration/time.duration.literals
Copied: libcxx/trunk/test/utilities/time/time.duration/literals.pass.cpp (from r187901, libcxx/trunk/test/utilities/time/time.duration/time.duration.literals)
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/time/time.duration/literals.pass.cpp?p2=libcxx/trunk/test/utilities/time/time.duration/literals.pass.cpp&p1=libcxx/trunk/test/utilities/time/time.duration/time.duration.literals&r1=187901&r2=187903&rev=187903&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/time/time.duration/time.duration.literals (original)
+++ libcxx/trunk/test/utilities/time/time.duration/literals.pass.cpp Wed Aug 7 14:35:46 2013
@@ -16,44 +16,44 @@
int main()
{
#if _LIBCPP_STD_VER > 11
- using namespace std::literals::chrono_literals;
+ using namespace std::literals::chrono_literals;
-// Make sure the types are right
- static_assert ( std::is_same<decltype( 3h ), std::chrono::hours>::value, "" );
- static_assert ( std::is_same<decltype( 3min ), std::chrono::minutes>::value, "" );
- static_assert ( std::is_same<decltype( 3s ), std::chrono::seconds>::value, "" );
- 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, "" );
-
- std::chrono::hours h = 4h;
- assert ( h == std::chrono::hours(4));
- auto h2 = 4.0h;
- assert ( h == h2 );
-
- std::chrono::minutes min = 36min;
- assert ( min == std::chrono::minutes(36));
- auto min2 = 36.0min;
- assert ( min == min2 );
+// Make sure the types are right
+ static_assert ( std::is_same<decltype( 3h ), std::chrono::hours>::value, "" );
+ static_assert ( std::is_same<decltype( 3min ), std::chrono::minutes>::value, "" );
+ static_assert ( std::is_same<decltype( 3s ), std::chrono::seconds>::value, "" );
+ 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, "" );
+
+ std::chrono::hours h = 4h;
+ assert ( h == std::chrono::hours(4));
+ auto h2 = 4.0h;
+ assert ( h == h2 );
+
+ std::chrono::minutes min = 36min;
+ assert ( min == std::chrono::minutes(36));
+ auto min2 = 36.0min;
+ assert ( min == min2 );
- std::chrono::seconds s = 24s;
- assert ( s == std::chrono::seconds(24));
- auto s2 = 24.0s;
- assert ( s == s2 );
+ std::chrono::seconds s = 24s;
+ assert ( s == std::chrono::seconds(24));
+ auto s2 = 24.0s;
+ assert ( s == s2 );
- std::chrono::milliseconds ms = 247ms;
- assert ( ms == std::chrono::milliseconds(247));
- auto ms2 = 247.0ms;
- assert ( ms == ms2 );
+ std::chrono::milliseconds ms = 247ms;
+ assert ( ms == std::chrono::milliseconds(247));
+ auto ms2 = 247.0ms;
+ assert ( ms == ms2 );
- std::chrono::microseconds us = 867us;
- assert ( us == std::chrono::microseconds(867));
- auto us2 = 867.0us;
- assert ( us == us2 );
+ std::chrono::microseconds us = 867us;
+ assert ( us == std::chrono::microseconds(867));
+ auto us2 = 867.0us;
+ assert ( us == us2 );
- std::chrono::nanoseconds ns = 645ns;
- assert ( ns == std::chrono::nanoseconds(645));
- auto ns2 = 645.ns;
- assert ( ns == ns2 );
+ std::chrono::nanoseconds ns = 645ns;
+ assert ( ns == std::chrono::nanoseconds(645));
+ auto ns2 = 645.ns;
+ assert ( ns == ns2 );
#endif
}
Removed: libcxx/trunk/test/utilities/time/time.duration/time.duration.literals
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/time/time.duration/time.duration.literals?rev=187902&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/time/time.duration/time.duration.literals (original)
+++ libcxx/trunk/test/utilities/time/time.duration/time.duration.literals (removed)
@@ -1,59 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <chrono>
-
-#include <chrono>
-#include <type_traits>
-#include <cassert>
-
-int main()
-{
-#if _LIBCPP_STD_VER > 11
- using namespace std::literals::chrono_literals;
-
-// Make sure the types are right
- static_assert ( std::is_same<decltype( 3h ), std::chrono::hours>::value, "" );
- static_assert ( std::is_same<decltype( 3min ), std::chrono::minutes>::value, "" );
- static_assert ( std::is_same<decltype( 3s ), std::chrono::seconds>::value, "" );
- 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, "" );
-
- std::chrono::hours h = 4h;
- assert ( h == std::chrono::hours(4));
- auto h2 = 4.0h;
- assert ( h == h2 );
-
- std::chrono::minutes min = 36min;
- assert ( min == std::chrono::minutes(36));
- auto min2 = 36.0min;
- assert ( min == min2 );
-
- std::chrono::seconds s = 24s;
- assert ( s == std::chrono::seconds(24));
- auto s2 = 24.0s;
- assert ( s == s2 );
-
- std::chrono::milliseconds ms = 247ms;
- assert ( ms == std::chrono::milliseconds(247));
- auto ms2 = 247.0ms;
- assert ( ms == ms2 );
-
- std::chrono::microseconds us = 867us;
- assert ( us == std::chrono::microseconds(867));
- auto us2 = 867.0us;
- assert ( us == us2 );
-
- std::chrono::nanoseconds ns = 645ns;
- assert ( ns == std::chrono::nanoseconds(645));
- auto ns2 = 645.ns;
- assert ( ns == ns2 );
-#endif
-}
More information about the cfe-commits
mailing list