summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-03-07 14:30:52 -0800
committerNathan Binkert <nate@binkert.org>2009-03-07 14:30:52 -0800
commit66a85b54e2f59e13b726f05a30bb115f2fb10dbc (patch)
tree7c9b2bed714a32101b736258f0757b32fd06ae8f
parent6f787e3d368eb248aee0854d99ed55e332d80170 (diff)
downloadgem5-66a85b54e2f59e13b726f05a30bb115f2fb10dbc.tar.xz
build: fix errors for compilers other than g++ 4.3
-rw-r--r--src/base/cp_annotate.hh2
-rw-r--r--src/base/statistics.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 9ec39b6cb..13ced82de 100644
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -53,7 +53,7 @@ class ThreadContext;
#if !CP_ANNOTATE
-class CPA : SimObject
+class CPA
{
public:
enum flags {
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 6240be7a2..827c1d311 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -2495,7 +2495,7 @@ class VectorDistribution : public VectorDistBase<VectorDistribution, DistStor>
params->min = min;
params->max = max;
params->bucket_size = bkt;
- params->buckets = rint((max - min) / bkt + 1.0);
+ params->buckets = (size_type)rint((max - min) / bkt + 1.0);
this->setParams(params);
this->doInit(size);
return this->self();