diff options
author | Peter Kasting <pkasting@google.com> | 2015-06-11 14:31:38 -0700 |
---|---|---|
committer | Peter Kasting <pkasting@google.com> | 2015-06-11 21:31:48 +0000 |
commit | 728d9037c016c01295177fa700fc7927f0bb80bb (patch) | |
tree | 808f3f16c1ef276ebc6ab8e1bacfb29e2de72a96 /webrtc/tools | |
parent | b7e5054414ff524f9db81dab7917729b8c4c8bcb (diff) | |
download | webrtc-728d9037c016c01295177fa700fc7927f0bb80bb.tar.gz |
Reformat existing code. There should be no functional effects.
This includes changes like:
* Attempt to break lines at better positions
* Use "override" in more places, don't use "virtual" with it
* Use {} where the body is more than one line
* Make declaration and definition arg names match
* Eliminate unused code
* EXPECT_EQ(expected, actual) (but use (actual, expected) for e.g. _GT)
* Correct #include order
* Use anonymous namespaces in preference to "static" for file-scoping
* Eliminate unnecessary casts
* Update reference code in comments of ARM assembly sources to match actual current C code
* Fix indenting to be more style-guide compliant
* Use arraysize() in more places
* Use bool instead of int for "boolean" values (0/1)
* Shorten and simplify code
* Spaces around operators
* 80 column limit
* Use const more consistently
* Space goes after '*' in type name, not before
* Remove unnecessary return values
* Use "(var == const)", not "(const == var)"
* Spelling
* Prefer true, typed constants to "enum hack" constants
* Avoid "virtual" on non-overridden functions
* ASSERT(x == y) -> ASSERT_EQ(y, x)
BUG=none
R=andrew@webrtc.org, asapersson@webrtc.org, henrika@webrtc.org, juberti@webrtc.org, kjellander@webrtc.org, kwiberg@webrtc.org
Review URL: https://codereview.webrtc.org/1172163004
Cr-Commit-Position: refs/heads/master@{#9420}
Diffstat (limited to 'webrtc/tools')
-rw-r--r-- | webrtc/tools/agc/activity_metric.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/tools/agc/activity_metric.cc b/webrtc/tools/agc/activity_metric.cc index a51216acd9..57e2ad615f 100644 --- a/webrtc/tools/agc/activity_metric.cc +++ b/webrtc/tools/agc/activity_metric.cc @@ -292,7 +292,7 @@ void void_main(int argc, char* argv[]) { ASSERT_GE(ret_val, 0); if (ret_val > 0) { - ASSERT_TRUE(ret_val == true_vad_index); + ASSERT_EQ(true_vad_index, ret_val); for (int n = 0; n < ret_val; n++) { if (true_vad[n] == 1) { total_active++; |