[gem5-dev] changeset in gem5: sim: Make clang happy

[Andreas Hansson]

changeset 05ac17048f55 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=05ac17048f55
description:
        sim: Make clang happy

        Once again appeasing clang.

diffstat:

 src/sim/clocked_object.hh |  2 +-
 src/sim/mathexpr.cc       |  5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 76d0e456a9a9 -r 05ac17048f55 src/sim/clocked_object.hh
--- a/src/sim/clocked_object.hh Tue Jun 07 14:27:35 2016 +0100
+++ b/src/sim/clocked_object.hh Tue Jun 07 14:27:49 2016 +0100
@@ -264,7 +264,7 @@
     void computeStats();
 
     void pwrState(Enums::PwrState);
-    void regStats();
+    void regStats() override;
 
   protected:
 
diff -r 76d0e456a9a9 -r 05ac17048f55 src/sim/mathexpr.cc
--- a/src/sim/mathexpr.cc       Tue Jun 07 14:27:35 2016 +0100
+++ b/src/sim/mathexpr.cc       Tue Jun 07 14:27:49 2016 +0100
@@ -40,6 +40,7 @@
 #include "sim/mathexpr.hh"
 
 #include <algorithm>
+#include <cmath>
 #include <regex>
 #include <string>
 
@@ -47,7 +48,7 @@
 
 MathExpr::MathExpr(std::string expr)
  : ops(
-    std::array<OpSearch, uNeg + 1> {
+     std::array<OpSearch, uNeg + 1> {{
       OpSearch {true, bAdd, 0, '+', [](double a, double b) { return a + b; }},
       OpSearch {true, bSub, 0, '-', [](double a, double b) { return a - b; }},
       OpSearch {true, bMul, 1, '*', [](double a, double b) { return a * b; }},
@@ -55,7 +56,7 @@
       OpSearch {false,uNeg, 2, '-', [](double a, double b) { return -b; }},
       OpSearch {true, bPow, 3, '^', [](double a, double b) {
                  return std::pow(a,b); }
-      },
+      }},
     })
 {
     // Cleanup
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev