Author: marshall
Date: Tue Jul 31 12:25:00 2018
New Revision: 338419
URL: http://llvm.org/viewvc/llvm-project?rev=338419&view=rev
Log:
import timespec and timespec_get into namespace std if we're under c++17 or
later AND the underlying C library has them. Fixes PR#38220, but doesn't
implement all of P0063 yet.
Modified:
libcxx/trunk/include/ctime
libcxx/trunk/test/std/language.support/support.runtime/ctime.pass.cpp
libcxx/trunk/test/std/utilities/time/date.time/ctime.pass.cpp
Modified: libcxx/trunk/include/ctime
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ctime?rev=338419&r1=338418&r2=338419&view=diff
==============================================================================
--- libcxx/trunk/include/ctime (original)
+++ libcxx/trunk/include/ctime Tue Jul 31 12:25:00 2018
@@ -18,7 +18,8 @@ Macros:
NULL
CLOCKS_PER_SEC
-
+ TIME_UTC // C++17
+
namespace std
{
@@ -28,7 +29,8 @@ Types:
size_t
time_t
tm
-
+ timespec // C++17
+
clock_t clock();
double difftime(time_t time1, time_t time0);
time_t mktime(tm* timeptr);
@@ -39,7 +41,7 @@ tm* gmtime(const time_t* timer);
tm* localtime(const time_t* timer);
size_t strftime(char* restrict s, size_t maxsize, const char* restrict format,
const tm* restrict timeptr);
-
+int timespec_get( struct timespec *ts, int base); // C++17
} // std
*/
@@ -57,6 +59,9 @@ using ::clock_t;
using ::size_t;
using ::time_t;
using ::tm;
+#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_C11_FEATURES)
+using ::timespec;
+#endif
using ::clock;
using ::difftime;
using ::mktime;
@@ -68,6 +73,9 @@ using ::gmtime;
using ::localtime;
#endif
using ::strftime;
+#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_C11_FEATURES)
+using ::timespec_get;
+#endif
_LIBCPP_END_NAMESPACE_STD
Modified: libcxx/trunk/test/std/language.support/support.runtime/ctime.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.runtime/ctime.pass.cpp?rev=338419&r1=338418&r2=338419&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.runtime/ctime.pass.cpp
(original)
+++ libcxx/trunk/test/std/language.support/support.runtime/ctime.pass.cpp Tue
Jul 31 12:25:00 2018
@@ -11,6 +11,7 @@
#include <ctime>
#include <type_traits>
+#include "test_macros.h"
#ifndef NULL
#error NULL not defined
@@ -20,12 +21,22 @@
#error CLOCKS_PER_SEC not defined
#endif
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#ifndef TIME_UTC
+#error TIME_UTC not defined
+#endif
+#endif
+
int main()
{
std::clock_t c = 0;
std::size_t s = 0;
std::time_t t = 0;
std::tm tm = {};
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+ std::timespec tmspec = {};
+ ((void)tmspec); // Prevent unused warning
+#endif
((void)c); // Prevent unused warning
((void)s); // Prevent unused warning
((void)t); // Prevent unused warning
@@ -34,6 +45,9 @@ int main()
static_assert((std::is_same<decltype(std::difftime(t,t)), double>::value),
"");
static_assert((std::is_same<decltype(std::mktime(&tm)),
std::time_t>::value), "");
static_assert((std::is_same<decltype(std::time(&t)), std::time_t>::value),
"");
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+ static_assert((std::is_same<decltype(std::timespec_get(nullptr, 0)),
int>::value), "");
+#endif
#ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
static_assert((std::is_same<decltype(std::asctime(&tm)), char*>::value),
"");
static_assert((std::is_same<decltype(std::ctime(&t)), char*>::value), "");
Modified: libcxx/trunk/test/std/utilities/time/date.time/ctime.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/time/date.time/ctime.pass.cpp?rev=338419&r1=338418&r2=338419&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/time/date.time/ctime.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/time/date.time/ctime.pass.cpp Tue Jul 31
12:25:00 2018
@@ -10,6 +10,8 @@
#include <ctime>
#include <type_traits>
+#include "test_macros.h"
+
#ifndef NULL
#error NULL not defined
#endif
@@ -18,6 +20,12 @@
#error CLOCKS_PER_SEC not defined
#endif
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#ifndef TIME_UTC
+#error TIME_UTC not defined
+#endif
+#endif
+
int main()
{
std::clock_t c = 0;
@@ -30,10 +38,18 @@ int main()
((void)t); // Prevent unused warning
((void)tm); // Prevent unused warning
((void)str); // Prevent unused warning
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+ std::timespec tmspec = {};
+ ((void)tmspec); // Prevent unused warning
+#endif
+
static_assert((std::is_same<decltype(std::clock()), std::clock_t>::value),
"");
static_assert((std::is_same<decltype(std::difftime(t,t)), double>::value),
"");
static_assert((std::is_same<decltype(std::mktime(&tm)),
std::time_t>::value), "");
static_assert((std::is_same<decltype(std::time(&t)), std::time_t>::value),
"");
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+ static_assert((std::is_same<decltype(std::timespec_get(nullptr, 0)),
int>::value), "");
+#endif
#ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
static_assert((std::is_same<decltype(std::asctime(&tm)), char*>::value),
"");
static_assert((std::is_same<decltype(std::ctime(&t)), char*>::value), "");
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
