commit 3c95ad039bf8331c0caab594845d495755691534
author Super Dan <dpadgett@google.com> Tue Apr 12 00:38:14 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 12 00:38:15 2016 +0000
tree b48767b4483a324c55e8e9b2176b0b98dd6e46ba
parent 9c2af41d7a2993760c67db1fea1cf59f2a1d3f29
parent b5a56daf7b4804134e3be073747d6c93f603cc7b

Merge "platform: gcc 5.3 fix"

base/time.cc

diff --git a/base/time.cc b/base/time.cc
index d1427c3..2672023 100644
--- a/base/time.cc
+++ b/base/time.cc
@@ -65,7 +65,7 @@
 }
 
 // Make sure someone calls it so that it gets initialized
-static uint32 ignore = StartTime();
+static uint32 __attribute__((used)) ignore = StartTime();
 
 uint32 TimeAfter(int32 elapsed) {
   ASSERT(elapsed >= 0);

speedtest/utils.cc

diff --git a/speedtest/utils.cc b/speedtest/utils.cc
index 580b54b..8144174 100644
--- a/speedtest/utils.cc
+++ b/speedtest/utils.cc
@@ -67,7 +67,7 @@
     return false;
   }
   std::istringstream n(str);
-  return n >> *result;
+  return !(n >> *result).fail();
 }
 
 // Trim from start in place