diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 20:48:42 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 20:48:42 +0000 |
| commit | ad341d69d3ea344a1e93906b10561a1b20898efb (patch) | |
| tree | 23e7c249a5493a42d5c2c414e1224a7dae773f5c /ppapi | |
| parent | 205294bddfb47d6581a9dd961e95cd01ead71cac (diff) | |
| download | chromium_src-ad341d69d3ea344a1e93906b10561a1b20898efb.zip chromium_src-ad341d69d3ea344a1e93906b10561a1b20898efb.tar.gz chromium_src-ad341d69d3ea344a1e93906b10561a1b20898efb.tar.bz2 | |
Fix "unreachable code" warnings (MSVC warning 4702) in ppapi/.
BUG=346399
TEST=none
R=dmichael@chromium.org
Review URL: https://codereview.chromium.org/197203004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/serialized_var.cc | 4 | ||||
| -rw-r--r-- | ppapi/tests/test_file_mapping.cc | 1 | ||||
| -rw-r--r-- | ppapi/tests/test_talk_private.cc | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc index 72e7cc8..d00a7d3 100644 --- a/ppapi/proxy/serialized_var.cc +++ b/ppapi/proxy/serialized_var.cc @@ -68,14 +68,14 @@ PP_Var SerializedVar::Inner::GetVar() { #if defined(NACL_WIN64) NOTREACHED(); return PP_MakeUndefined(); -#endif - +#else if (raw_var_data_.get()) { var_ = raw_var_data_->CreatePPVar(instance_); raw_var_data_.reset(NULL); } return var_; +#endif } void SerializedVar::Inner::SetVar(PP_Var var) { diff --git a/ppapi/tests/test_file_mapping.cc b/ppapi/tests/test_file_mapping.cc index 8781a33..96ea325 100644 --- a/ppapi/tests/test_file_mapping.cc +++ b/ppapi/tests/test_file_mapping.cc @@ -498,7 +498,6 @@ std::string TestFileMapping::TestPartialRegions() { callback.GetCallback().pp_completion_callback())); CHECK_CALLBACK_BEHAVIOR(callback); ASSERT_EQ(PP_OK, callback.result()); - PASS(); // Write something else to the mapped region, then unmap, and see if it // gets written to both files. (Note we have to Unmap to make sure that the diff --git a/ppapi/tests/test_talk_private.cc b/ppapi/tests/test_talk_private.cc index aa2b5c0..80fee1f 100644 --- a/ppapi/tests/test_talk_private.cc +++ b/ppapi/tests/test_talk_private.cc @@ -55,12 +55,9 @@ std::string TestTalkPrivate::TestGetPermission() { PASS(); } -#if defined(USE_ASH) // Under Ash, this will prompt the user so the test cannot run in an automated - // fashion. To manually test under Ash, comment this out. - PASS(); -#endif - + // fashion. To manually test under Ash, replace "!defined(USE_ASH)" with 1. +#if !defined(USE_ASH) PP_Resource talk_resource = talk_private_interface_1->Create( instance_->pp_instance()); @@ -79,6 +76,6 @@ std::string TestTalkPrivate::TestGetPermission() { if (callback.result() != 0) return "Unexpected non-zero result"; #endif - +#endif PASS(); } |