Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: crypto/nss_util_unittest.cc

Issue 659943004: Type conversion fixes, crypto/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « crypto/ec_private_key_nss.cc ('k') | crypto/signature_verifier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/nss_util_unittest.cc
diff --git a/crypto/nss_util_unittest.cc b/crypto/nss_util_unittest.cc
index b68788513c6a441908be43be2eb2fb73c487edf5..28591916d3f65f0762a9d1e941f56f4219263fa9 100644
--- a/crypto/nss_util_unittest.cc
+++ b/crypto/nss_util_unittest.cc
@@ -19,14 +19,17 @@ TEST(NSSUtilTest, PRTimeConversion) {
prxtime.tm_params.tp_gmt_offset = 0;
prxtime.tm_params.tp_dst_offset = 0;
base::Time::Exploded exploded;
- prxtime.tm_year = exploded.year = 2011;
+ exploded.year = prxtime.tm_year = 2011;
exploded.month = 12;
prxtime.tm_month = 11;
- prxtime.tm_wday = exploded.day_of_week = 0; // Should be unusued.
- prxtime.tm_mday = exploded.day_of_month = 10;
- prxtime.tm_hour = exploded.hour = 2;
- prxtime.tm_min = exploded.minute = 52;
- prxtime.tm_sec = exploded.second = 19;
+ // PRExplodedTime::tm_wday is a smaller type than Exploded::day_of_week, so
+ // assigning the two in this order instead of the reverse avoids potential
+ // warnings about type downcasting.
+ exploded.day_of_week = prxtime.tm_wday = 0; // Should be unused.
+ exploded.day_of_month = prxtime.tm_mday = 10;
+ exploded.hour = prxtime.tm_hour = 2;
+ exploded.minute = prxtime.tm_min = 52;
+ exploded.second = prxtime.tm_sec = 19;
exploded.millisecond = 342;
prxtime.tm_usec = 342000;
« no previous file with comments | « crypto/ec_private_key_nss.cc ('k') | crypto/signature_verifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698