In the launch.mm file use the crashpad::implicit_cast .. explicitly.

Until the base one goes away this complains of it being ambiguous.

R=mark@chromium.org, scottmg@chromium.org
BUG=529769, 472900, crashpad:51

Review URL: https://codereview.chromium.org/1336413003 .
This commit is contained in:
Scott Graham 2015-09-14 15:17:51 -07:00
parent 4f3f1b68d5
commit 595803e1be

View File

@ -16,7 +16,6 @@
#import <Foundation/Foundation.h>
#include "base/basictypes.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_launch_data.h"
#include "base/mac/scoped_cftyperef.h"
@ -45,8 +44,8 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
return nullptr;
}
CFPropertyListRef value_cf =
implicit_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]);
CFPropertyListRef value_cf = crashpad::implicit_cast<CFPropertyListRef>(
[dictionary_ns objectForKey:key]);
launch_data_t value_launch = CFPropertyToLaunchData(value_cf);
if (!value_launch) {
return nullptr;
@ -66,7 +65,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
for (id element_ns in array_ns) {
CFPropertyListRef element_cf =
implicit_cast<CFPropertyListRef>(element_ns);
crashpad::implicit_cast<CFPropertyListRef>(element_ns);
launch_data_t element_launch = CFPropertyToLaunchData(element_cf);
if (!element_launch) {
return nullptr;