diff options
| -rw-r--r-- | base/mysql.hh | 3 | ||||
| -rw-r--r-- | base/pollevent.hh | 1 | ||||
| -rw-r--r-- | dev/ethertap.hh | 3 | ||||
| -rw-r--r-- | dev/pciconfigall.hh | 1 | ||||
| -rw-r--r-- | dev/tsunami_cchip.hh | 2 | ||||
| -rw-r--r-- | dev/tsunami_io.hh | 2 | ||||
| -rw-r--r-- | dev/tsunami_pchip.hh | 2 | ||||
| -rw-r--r-- | sim/param.cc | 4 |
8 files changed, 16 insertions, 2 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 { diff --git a/dev/ethertap.hh b/dev/ethertap.hh index dbbada40e..069ba734f 100644 --- a/dev/ethertap.hh +++ b/dev/ethertap.hh @@ -42,6 +42,9 @@ #include "base/pollevent.hh" #include "sim/sim_object.hh" +class TapEvent; +class TapListener; + /* * Interface to connect a simulated ethernet device to the real world */ diff --git a/dev/pciconfigall.hh b/dev/pciconfigall.hh index 072a763f9..d9e623b7e 100644 --- a/dev/pciconfigall.hh +++ b/dev/pciconfigall.hh @@ -43,6 +43,7 @@ static const uint32_t MAX_PCI_DEV = 32; static const uint32_t MAX_PCI_FUNC = 8; class PciDev; +class MemoryController; /** * PCI Config Space diff --git a/dev/tsunami_cchip.hh b/dev/tsunami_cchip.hh index 931a0fb41..e5da3984c 100644 --- a/dev/tsunami_cchip.hh +++ b/dev/tsunami_cchip.hh @@ -37,6 +37,8 @@ #include "base/range.hh" #include "dev/io_device.hh" +class MemoryController; + /** * Tsunami CChip CSR Emulation. This device includes all the interrupt * handling code for the chipset. diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh index 35a417e6e..1187f5904 100644 --- a/dev/tsunami_io.hh +++ b/dev/tsunami_io.hh @@ -38,6 +38,8 @@ #include "dev/tsunami.hh" #include "sim/eventq.hh" +class MemoryController; + /** * Tsunami I/O device is a catch all for all the south bridge stuff we care * to implement. diff --git a/dev/tsunami_pchip.hh b/dev/tsunami_pchip.hh index 63ea67b1d..8c29a9ac9 100644 --- a/dev/tsunami_pchip.hh +++ b/dev/tsunami_pchip.hh @@ -37,6 +37,8 @@ #include "base/range.hh" #include "dev/io_device.hh" +class MemoryController; + /** * A very simple implementation of the Tsunami PCI interface chips. */ diff --git a/sim/param.cc b/sim/param.cc index 396fde3ac..bc81881d3 100644 --- a/sim/param.cc +++ b/sim/param.cc @@ -303,8 +303,8 @@ template void Param<type>::parse(const string &); \ template void VectorParam<type>::parse(const string &); \ template void Param<type>::showValue(ostream &) const; \ template void VectorParam<type>::showValue(ostream &) const; \ -void Param<type>::showType(ostream &os) const { os << typestr; } \ -void VectorParam<type>::showType(ostream &os) const { \ +template <> void Param<type>::showType(ostream &os) const { os << typestr; } \ +template <> void VectorParam<type>::showType(ostream &os) const { \ os << "vector of " << typestr; \ } #endif |