diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-08-28 16:48:57 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-09-01 11:05:16 +0000 |
| commit | 88b591f24cb3f94f982d7024c2e8ed25c2cc26a2 (patch) | |
| tree | d49741d0b0926c4c387e9d618b990ae89e6d2f8e /test_http_server.cc | |
| parent | f3e2801f18bae14e41099e007de7c9a019735556 (diff) | |
update_engine: Replace NULL with nullptr
Replaced the usage of NULL with nullptr. This also makes it possible to
use standard gtest macros to compare pointers in Update Manager's unit tests.
So, there is no need in custom UMTEST_... macros which are replaced with the
gtest macros (see change in update_engine/update_manager/umtest_utils.h):
UMTEST_ASSERT_NULL(p) => ASSERT_EQ(nullptr, p)
UMTEST_ASSERT_NOT_NULL(p) => ASSERT_NE(nullptr, p)
UMTEST_EXPECT_NULL(p) => EXPECT_EQ(nullptr, p)
UMTEST_EXPECT_NOT_NULL(p) => EXPECT_NE(nullptr, p)
BUG=None
TEST=FEATURES=test emerge-link update_engine
USE="clang asan" FEATURES=test emerge-link update_engine
Change-Id: I77a42a1e9ce992bb2f9f263db5cf75fe6110a4ec
Reviewed-on: https://chromium-review.googlesource.com/215136
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'test_http_server.cc')
| -rw-r--r-- | test_http_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test_http_server.cc b/test_http_server.cc index f5f9202e..2687d990 100644 --- a/test_http_server.cc +++ b/test_http_server.cc @@ -604,7 +604,7 @@ int main(int argc, char** argv) { while (1) { LOG(INFO) << "pid(" << getpid() << "): waiting to accept new connection"; - int client_fd = accept(listen_fd, NULL, NULL); + int client_fd = accept(listen_fd, nullptr, nullptr); LOG(INFO) << "got past accept"; if (client_fd < 0) LOG(FATAL) << "ERROR on accept"; |