From: Andreas Hansson <andreas.hansson@arm.com>
Date: Tue, 7 Jun 2016 13:27:49 +0000 (+0100)
Subject: sim: Make clang happy
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d177d128f14831f9490467863efb9c92d1480bc;p=gem5.git

sim: Make clang happy

Once again appeasing clang.
---

diff --git a/src/sim/clocked_object.hh b/src/sim/clocked_object.hh
index 25e2d0082..d85d226c9 100644
--- a/src/sim/clocked_object.hh
+++ b/src/sim/clocked_object.hh
@@ -264,7 +264,7 @@ class ClockedObject
     void computeStats();
 
     void pwrState(Enums::PwrState);
-    void regStats();
+    void regStats() override;
 
   protected:
 
diff --git a/src/sim/mathexpr.cc b/src/sim/mathexpr.cc
index d94639823..85c130ad0 100644
--- a/src/sim/mathexpr.cc
+++ b/src/sim/mathexpr.cc
@@ -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 @@ MathExpr::MathExpr(std::string expr)
       OpSearch {false,uNeg, 2, '-', [](double a, double b) { return -b; }},
       OpSearch {true, bPow, 3, '^', [](double a, double b) {
                  return std::pow(a,b); }
-      },
+      }},
     })
 {
     // Cleanup