summaryrefslogtreecommitdiffstats
path: root/tools/battor_agent
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2016-01-28 16:46:25 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-29 00:47:35 +0000
commit5911df8c175be2371f8907018a8c673120581912 (patch)
tree1c33726532929f4fffcb5b7e75a250a9a94aadce /tools/battor_agent
parent1ad3344c1b758730a510c64b21e656054efba1d0 (diff)
downloadchromium_src-5911df8c175be2371f8907018a8c673120581912.zip
chromium_src-5911df8c175be2371f8907018a8c673120581912.tar.gz
chromium_src-5911df8c175be2371f8907018a8c673120581912.tar.bz2
Fix narrowing warning in battor_sample_converter_unittest
On VS2015: d:\src\cr3\src\tools\battor_agent\battor_sample_converter_unittest.cc(28): error C2397: conversion from 'double' to 'int16_t' requires a narrowing conversion R=brucedawson@chromium.org, charliea@chromium.org BUG=440500 Review URL: https://codereview.chromium.org/1648123002 Cr-Commit-Position: refs/heads/master@{#372227}
Diffstat (limited to 'tools/battor_agent')
-rw-r--r--tools/battor_agent/battor_sample_converter_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/battor_agent/battor_sample_converter_unittest.cc b/tools/battor_agent/battor_sample_converter_unittest.cc
index f0b9935..01ad5e5 100644
--- a/tools/battor_agent/battor_sample_converter_unittest.cc
+++ b/tools/battor_agent/battor_sample_converter_unittest.cc
@@ -25,7 +25,7 @@ TEST(BattOrSampleConverterTest, ToSampleSimple) {
// Create a calibration frame with a baseline voltage and current of zero.
std::vector<RawBattOrSample> calibration_frame;
- calibration_frame.push_back(RawBattOrSample{0.0, 0.0});
+ calibration_frame.push_back(RawBattOrSample{0, 0});
BattOrSampleConverter converter(eeprom, calibration_frame);
// Set both the voltage and current to their max values.