diff options
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/config/gpu_control_list.cc | 6 | ||||
| -rw-r--r-- | gpu/config/gpu_test_expectations_parser.cc | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc index 0c645b5..cd4d4bd 100644 --- a/gpu/config/gpu_control_list.cc +++ b/gpu/config/gpu_control_list.cc @@ -837,15 +837,13 @@ bool GpuControlList::GpuControlListEntry::SetOsInfo( bool GpuControlList::GpuControlListEntry::SetVendorId( const std::string& vendor_id_string) { vendor_id_ = 0; - return base::HexStringToInt(vendor_id_string, - reinterpret_cast<int*>(&vendor_id_)); + return base::HexStringToUInt(vendor_id_string, &vendor_id_); } bool GpuControlList::GpuControlListEntry::AddDeviceId( const std::string& device_id_string) { uint32 device_id = 0; - if (base::HexStringToInt(device_id_string, - reinterpret_cast<int*>(&device_id))) { + if (base::HexStringToUInt(device_id_string, &device_id)) { device_id_list_.push_back(device_id); return true; } diff --git a/gpu/config/gpu_test_expectations_parser.cc b/gpu/config/gpu_test_expectations_parser.cc index 83bb300..dd08db6 100644 --- a/gpu/config/gpu_test_expectations_parser.cc +++ b/gpu/config/gpu_test_expectations_parser.cc @@ -449,8 +449,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig( DCHECK(config); uint32 device_id = 0; if (config->gpu_device_id() != 0 || - !base::HexStringToInt(gpu_device_id, - reinterpret_cast<int*>(&device_id)) || + !base::HexStringToUInt(gpu_device_id, &device_id) || device_id == 0) { PushErrorMessage(kErrorMessage[kErrorEntryWithGpuDeviceIdConflicts], line_number); |