diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/linux_util.cc | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
| download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/linux_util.cc')
| -rw-r--r-- | chromium/base/linux_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/linux_util.cc b/chromium/base/linux_util.cc index 851a6c67ab0..ddf848eeb70 100644 --- a/chromium/base/linux_util.cc +++ b/chromium/base/linux_util.cc @@ -48,7 +48,7 @@ class LinuxDistroHelper { // The simple state machine goes from: // STATE_DID_NOT_CHECK -> STATE_CHECK_STARTED -> STATE_CHECK_FINISHED. LinuxDistroHelper() : state_(STATE_DID_NOT_CHECK) {} - ~LinuxDistroHelper() {} + ~LinuxDistroHelper() = default; // Retrieve the current state, if we're in STATE_DID_NOT_CHECK, // we automatically move to STATE_CHECK_STARTED so nobody else will @@ -157,7 +157,7 @@ void SetLinuxDistro(const std::string& distro) { pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, bool* syscall_supported) { - if (syscall_supported != NULL) + if (syscall_supported != nullptr) *syscall_supported = false; std::vector<pid_t> tids; @@ -171,7 +171,7 @@ pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, int fd = open(buf, O_RDONLY); if (fd < 0) continue; - if (syscall_supported != NULL) + if (syscall_supported != nullptr) *syscall_supported = true; bool read_ret = ReadFromFD(fd, syscall_data.get(), expected_data.length()); close(fd); |