widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Resolving Compiler Warnings"

Browse Source
This commit is contained in:
Aaron Vaage
2017-01-30 17:51:44 +00:00
committed by Android (Google) Code Review
parent be448ed24a 3a5fdd71a0
commit e8a138b11c
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libwvdrmengine/cdm/metrics/include/distribution.h
View File

@@ -31,11 +31,11 @@ class Distribution {
// Return the value for each of the stats computed about the series of
// values (min, max, count, etc.).
const double Min() { return min_; }
const double Max() { return max_; }
const double Mean() { return mean_; }
const int64_t Count() { return count_; }
const double Variance() {
double Min() const { return min_; }
double Max() const { return max_; }
double Mean() const { return mean_; }
int64_t Count() const { return count_; }
double Variance() const {
return count_ == 0 ? 0.0 : sum_squared_deviation_ / count_;
}

6
libwvdrmengine/cdm/metrics/include/event_metric.h
View File

@@ -220,9 +220,9 @@ std::string MakeFieldNameString(const std::vector<std::string>& field_names,
// instances with no fields.
template<>
inline std::string MakeFieldNameString<Unused, Unused, Unused, Unused>(
const std::vector<std::string>& field_names,
const Unused unused1, const Unused unused2,
const Unused unused3, const Unused unused4) {
const std::vector<std::string>& /* field_names */,
const Unused /* unused1 */, const Unused /* unused2 */,
const Unused /* unused3 */, const Unused /* unused4 */) {
return "";
}