sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sim: Make clang happy

Browse source 
Once again appeasing clang.
This commit is contained in:
Andreas Hansson 2016-06-07 14:27:49 +01:00
parent 0257fdee91
commit 8d177d128f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sim/clocked_object.hh
View file

@ -264,7 +264,7 @@ class ClockedObject
void computeStats(); void computeStats();
void pwrState(Enums::PwrState); void pwrState(Enums::PwrState);
void regStats(); void regStats() override;
protected: protected:

5
src/sim/mathexpr.cc
View file

@ -40,6 +40,7 @@
#include "sim/mathexpr.hh" #include "sim/mathexpr.hh"
#include <algorithm> #include <algorithm>
#include <cmath>
#include <regex> #include <regex>
#include <string> #include <string>
@ -47,7 +48,7 @@
MathExpr::MathExpr(std::string expr) MathExpr::MathExpr(std::string expr)
: ops( : ops(
std::array<OpSearch, uNeg + 1> { std::array<OpSearch, uNeg + 1> {{
OpSearch {true, bAdd, 0, '+', [](double a, double b) { return a + b; }}, OpSearch {true, bAdd, 0, '+', [](double a, double b) { return a + b; }},
OpSearch {true, bSub, 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; }}, 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 {false,uNeg, 2, '-', [](double a, double b) { return -b; }},
OpSearch {true, bPow, 3, '^', [](double a, double b) { OpSearch {true, bPow, 3, '^', [](double a, double b) {
return std::pow(a,b); } return std::pow(a,b); }
}, }},
}) })
{ {
// Cleanup // Cleanup