From d6c3a2783d37f45787cd9a62a36b360ab829eb34 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 28 Jul 2015 08:57:16 -0700 Subject: [PATCH] Fix chromium style checker error on windows sandbox code. This change fixes "Complex constructor has an inline body." error generated by Windows clang. Original patch from yyanisawa@chromium.org, reviewed at https://codereview.chromium.org/1252913006/ BUG=82385 TBR=wfh Review URL: https://codereview.chromium.org/1257963003. Cr-Commit-Position: refs/heads/master@{#340690} --- sandbox/win/src/Wow64.cc | 4 ++++ sandbox/win/src/Wow64.h | 3 +-- sandbox/win/src/Wow64_64.cc | 4 ++++ sandbox/win/src/job.cc | 3 +++ sandbox/win/src/job.h | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sandbox/win/src/Wow64.cc b/sandbox/win/src/Wow64.cc index f17838659191..24facfc7c11b 100644 --- a/sandbox/win/src/Wow64.cc +++ b/sandbox/win/src/Wow64.cc @@ -73,6 +73,10 @@ typedef BOOL (WINAPI* IsWow64ProcessFunction)(HANDLE process, BOOL* wow64); namespace sandbox { +Wow64::Wow64(TargetProcess* child, HMODULE ntdll) + : child_(child), ntdll_(ntdll), dll_load_(NULL), continue_load_(NULL) { +} + Wow64::~Wow64() { } diff --git a/sandbox/win/src/Wow64.h b/sandbox/win/src/Wow64.h index df23c097270d..5858ed8a713c 100644 --- a/sandbox/win/src/Wow64.h +++ b/sandbox/win/src/Wow64.h @@ -19,8 +19,7 @@ class TargetProcess; // subsystem on 64 bit OSes, from the point of view of interceptions. class Wow64 { public: - Wow64(TargetProcess* child, HMODULE ntdll) - : child_(child), ntdll_(ntdll), dll_load_(NULL), continue_load_(NULL) {} + Wow64(TargetProcess* child, HMODULE ntdll); ~Wow64(); // Waits for the 32 bit DLL to get loaded on the child process. This function diff --git a/sandbox/win/src/Wow64_64.cc b/sandbox/win/src/Wow64_64.cc index f03831bd1154..357deb8559f4 100644 --- a/sandbox/win/src/Wow64_64.cc +++ b/sandbox/win/src/Wow64_64.cc @@ -8,6 +8,10 @@ namespace sandbox { +Wow64::Wow64(TargetProcess* child, HMODULE ntdll) + : child_(child), ntdll_(ntdll), dll_load_(NULL), continue_load_(NULL) { +} + Wow64::~Wow64() { } diff --git a/sandbox/win/src/job.cc b/sandbox/win/src/job.cc index edbb31c283a3..9c854e57ef4d 100644 --- a/sandbox/win/src/job.cc +++ b/sandbox/win/src/job.cc @@ -9,6 +9,9 @@ namespace sandbox { +Job::Job() : job_handle_(NULL) { +}; + Job::~Job() { }; diff --git a/sandbox/win/src/job.h b/sandbox/win/src/job.h index d2a7ed88504b..4b7cb72e164d 100644 --- a/sandbox/win/src/job.h +++ b/sandbox/win/src/job.h @@ -18,7 +18,7 @@ namespace sandbox { // job.AssignProcessToJob(process_handle); class Job { public: - Job() : job_handle_(NULL) { } + Job(); ~Job(); -- 2.11.4.GIT