Use CATCH_NULL instead of NULL

- expands to nullptr if CATCH_CONFIG_CPP11_NULLPTR is defined (see #444)
This commit is contained in:
Phil Nash committed 2015-07-01 07:33:27 +01:00
1 parent 3b18d9e962
commit 805de43a3d
25 files changed
+112 -101

No files matched your search

+1 -1
View File
@@ -37,7 +37,7 @@ namespace Catch {
#else
uint64_t getCurrentTicks() {
timeval t;
gettimeofday(&t,NULL);
gettimeofday(&t,CATCH_NULL);
return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
}
#endif