diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-25 00:48:57 -0700 |
| commit | cd81d94322a39503e4a3e87b6ee03d4fcb3465fb (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /unittests/Support/TimeValueTest.cpp | |
| parent | 0c5f13c0c4499eaf42ab5e9e2ceabd4e20e36861 (diff) | |
| download | external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.zip external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.tar.gz external_llvm-cd81d94322a39503e4a3e87b6ee03d4fcb3465fb.tar.bz2 | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'unittests/Support/TimeValueTest.cpp')
| -rw-r--r-- | unittests/Support/TimeValueTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/Support/TimeValueTest.cpp b/unittests/Support/TimeValueTest.cpp index 8058812..3d2b978 100644 --- a/unittests/Support/TimeValueTest.cpp +++ b/unittests/Support/TimeValueTest.cpp @@ -16,7 +16,7 @@ namespace { TEST(TimeValue, time_t) { sys::TimeValue now = sys::TimeValue::now(); - time_t now_t = time(NULL); + time_t now_t = time(nullptr); EXPECT_TRUE(std::abs(static_cast<long>(now_t - now.toEpochTime())) < 2); } |