summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-09-12 03:01:43 -0400
committerAli Saidi <saidi@eecs.umich.edu>2005-09-12 03:01:43 -0400
commitc62760e3cbe912e17c25e9fc0bd0810a79d676bb (patch)
treebc23372cd27e3362135c3e1efdb0b4bff5e94d81 /base
parent845bdb0d8edf3c8e5f8871eba984933bfca6a743 (diff)
downloadgem5-c62760e3cbe912e17c25e9fc0bd0810a79d676bb.tar.xz
fixes for gcc 4.0
base/mysql.hh: include mysql_version to get rid of that annoying mysql error. make sure refcount is set in all constructors base/pollevent.hh: dev/ethertap.hh: dev/pciconfigall.hh: dev/tsunami_cchip.hh: dev/tsunami_io.hh: dev/tsunami_pchip.hh: sim/param.cc: fix for gcc 4 --HG-- extra : convert_revision : be626af2f40ca402818996ef27249ae256c63ef1
Diffstat (limited to 'base')
-rw-r--r--base/mysql.hh3
-rw-r--r--base/pollevent.hh1
2 files changed, 4 insertions, 0 deletions
diff --git a/base/mysql.hh b/base/mysql.hh
index 2278d42e7..ae28a9dfb 100644
--- a/base/mysql.hh
+++ b/base/mysql.hh
@@ -33,6 +33,7 @@
#include <cassert>
#include <iosfwd>
+#include <mysql_version.h>
#include <mysql.h>
#include <string>
#include <sstream>
@@ -89,6 +90,8 @@ class Result
{
if (result)
refcount = new int(1);
+ else
+ refcount = NULL;
}
Result(const Result &result)
diff --git a/base/pollevent.hh b/base/pollevent.hh
index 13092df2c..d39931797 100644
--- a/base/pollevent.hh
+++ b/base/pollevent.hh
@@ -34,6 +34,7 @@
#include "sim/root.hh"
class Checkpoint;
+class PollQueue;
class PollEvent
{