summaryrefslogtreecommitdiffstats
path: root/sandbox/win
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-12-07 10:49:16 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-07 18:49:56 +0000
commit81e2ab0e0387912e9ae3e93b469db4510fede12c (patch)
treedd04ceb11632753c9f5debff4a1f0dc08c6ac20f /sandbox/win
parenta86d6e92da3e6c3ce8809ae7dab1f77d83d74a7c (diff)
downloadchromium_src-81e2ab0e0387912e9ae3e93b469db4510fede12c.zip
chromium_src-81e2ab0e0387912e9ae3e93b469db4510fede12c.tar.gz
chromium_src-81e2ab0e0387912e9ae3e93b469db4510fede12c.tar.bz2
clang/win: Make sandbox_nt_util.cc build with -Wunused-value in release.
Fixes: ..\..\sandbox\win\src\sandbox_nt_util.cc(138,24) : error: expression result unused [-Werror,-Wunused-value] VERIFY_SUCCESS(ret); ^~~ ..\..\sandbox/win/src/sandbox_nt_util.h(46,33) : note: expanded from macro 'VERIFY_SUCCESS' #define VERIFY_SUCCESS(action) (action) ^~~~~~ BUG=505318 Review URL: https://codereview.chromium.org/1500933003 Cr-Commit-Position: refs/heads/master@{#363534}
Diffstat (limited to 'sandbox/win')
-rw-r--r--sandbox/win/src/sandbox_nt_util.cc3
-rw-r--r--sandbox/win/src/sandbox_nt_util.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc
index 82de75c..35b9e73 100644
--- a/sandbox/win/src/sandbox_nt_util.cc
+++ b/sandbox/win/src/sandbox_nt_util.cc
@@ -134,8 +134,7 @@ bool MapGlobalMemory() {
if (NULL != _InterlockedCompareExchangePointer(&g_shared_IPC_memory,
memory, NULL)) {
// Somebody beat us to the memory setup.
- ret = g_nt.UnmapViewOfSection(NtCurrentProcess, memory);
- VERIFY_SUCCESS(ret);
+ VERIFY_SUCCESS(g_nt.UnmapViewOfSection(NtCurrentProcess, memory));
}
DCHECK_NT(g_shared_IPC_size > 0);
g_shared_policy_memory = reinterpret_cast<char*>(g_shared_IPC_memory)
diff --git a/sandbox/win/src/sandbox_nt_util.h b/sandbox/win/src/sandbox_nt_util.h
index 3dee932..17e5027 100644
--- a/sandbox/win/src/sandbox_nt_util.h
+++ b/sandbox/win/src/sandbox_nt_util.h
@@ -32,9 +32,9 @@ void __cdecl operator delete(void* memory, void* buffer,
// DCHECK_NT is defined to be pretty much an assert at this time because we
// don't have logging from the ntdll layer on the child.
//
-// VERIFY_NT and VERIFY_SUCCESS_NT are the standard asserts on debug, but
+// VERIFY_NT and VERIFY_SUCCESS are the standard asserts on debug, but
// execute the actual argument on release builds. VERIFY_NT expects an action
-// returning a bool, while VERIFY_SUCCESS_NT expects an action returning
+// returning a bool, while VERIFY_SUCCESS expects an action returning
// NTSTATUS.
#ifndef NDEBUG
#define DCHECK_NT(condition) { (condition) ? (void)0 : __debugbreak(); }