diff options
author | Povilas Kanapickas <povilas@radix.lt> | 2020-11-27 18:48:54 +0200 |
---|---|---|
committer | Povilas Kanapickas <povilas@radix.lt> | 2020-11-27 18:48:54 +0200 |
commit | 5ee43f5e4e33260f77e24e1239c260689140e982 (patch) | |
tree | d95d716a8404367878e2cba4e65b9b77c18f221e | |
parent | 81f45f5dd9ecdc0d078c959cf728e87a837e0312 (diff) |
Fix old style cast warnings
-rw-r--r-- | src/xserver.cpp | 9 | ||||
-rw-r--r-- | test/process-test.cpp | 2 | ||||
-rw-r--r-- | test/xserver-test.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/xserver.cpp b/src/xserver.cpp index 081e5f5..9d3706d 100644 --- a/src/xserver.cpp +++ b/src/xserver.cpp @@ -425,10 +425,11 @@ static int _x_error_handler(Display *dpy, XErrorEvent *err) break; } - ADD_FAILURE() << "XError received: " << error.str() << ", request " << - (int)err->request_code << "(" << (int)err->minor_code << "), detail: " - << err->resourceid << "\nThis error handler is likely to be triggered " - "more than once.\nCheck the first error for the real error"; + ADD_FAILURE() << "XError received: " << error.str() << ", request " + << static_cast<int>(err->request_code) << "(" << static_cast<int>(err->minor_code) + << "), detail: " << err->resourceid + << "\nThis error handler is likely to be triggered " + "more than once.\nCheck the first error for the real error"; return 0; } diff --git a/test/process-test.cpp b/test/process-test.cpp index e42d476..db13d0d 100644 --- a/test/process-test.cpp +++ b/test/process-test.cpp @@ -91,7 +91,7 @@ TEST(Process, ChildTearDown) char *buffer; ASSERT_GT(asprintf(&buffer, "%d", p.Pid()), 0); - ASSERT_EQ(write(pipefd[1], buffer, strlen(buffer)), (int)strlen(buffer)); + ASSERT_EQ(write(pipefd[1], buffer, strlen(buffer)), static_cast<int>(strlen(buffer))); close(pipefd[1]); raise(SIGKILL); diff --git a/test/xserver-test.cpp b/test/xserver-test.cpp index a7f4759..785a152 100644 --- a/test/xserver-test.cpp +++ b/test/xserver-test.cpp @@ -321,7 +321,7 @@ TEST(XServer, KeepAlive) char *buffer; ASSERT_GT(asprintf(&buffer, "%d", server.Pid()), 0); - ASSERT_EQ(write(pipefd[1], buffer, strlen(buffer)), (int)strlen(buffer)); + ASSERT_EQ(write(pipefd[1], buffer, strlen(buffer)), static_cast<int>(strlen(buffer))); close(pipefd[1]); free(buffer); exit(0); |