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
This commit is contained in:
parent
845bdb0d8e
commit
c62760e3cb
8 changed files with 16 additions and 2 deletions
|
@ -33,6 +33,7 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
|
#include <mysql_version.h>
|
||||||
#include <mysql.h>
|
#include <mysql.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
@ -89,6 +90,8 @@ class Result
|
||||||
{
|
{
|
||||||
if (result)
|
if (result)
|
||||||
refcount = new int(1);
|
refcount = new int(1);
|
||||||
|
else
|
||||||
|
refcount = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Result(const Result &result)
|
Result(const Result &result)
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "sim/root.hh"
|
#include "sim/root.hh"
|
||||||
|
|
||||||
class Checkpoint;
|
class Checkpoint;
|
||||||
|
class PollQueue;
|
||||||
|
|
||||||
class PollEvent
|
class PollEvent
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,6 +42,9 @@
|
||||||
#include "base/pollevent.hh"
|
#include "base/pollevent.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
|
|
||||||
|
class TapEvent;
|
||||||
|
class TapListener;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Interface to connect a simulated ethernet device to the real world
|
* Interface to connect a simulated ethernet device to the real world
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -43,6 +43,7 @@ static const uint32_t MAX_PCI_DEV = 32;
|
||||||
static const uint32_t MAX_PCI_FUNC = 8;
|
static const uint32_t MAX_PCI_FUNC = 8;
|
||||||
|
|
||||||
class PciDev;
|
class PciDev;
|
||||||
|
class MemoryController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PCI Config Space
|
* PCI Config Space
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#include "base/range.hh"
|
#include "base/range.hh"
|
||||||
#include "dev/io_device.hh"
|
#include "dev/io_device.hh"
|
||||||
|
|
||||||
|
class MemoryController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tsunami CChip CSR Emulation. This device includes all the interrupt
|
* Tsunami CChip CSR Emulation. This device includes all the interrupt
|
||||||
* handling code for the chipset.
|
* handling code for the chipset.
|
||||||
|
|
|
@ -38,6 +38,8 @@
|
||||||
#include "dev/tsunami.hh"
|
#include "dev/tsunami.hh"
|
||||||
#include "sim/eventq.hh"
|
#include "sim/eventq.hh"
|
||||||
|
|
||||||
|
class MemoryController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tsunami I/O device is a catch all for all the south bridge stuff we care
|
* Tsunami I/O device is a catch all for all the south bridge stuff we care
|
||||||
* to implement.
|
* to implement.
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#include "base/range.hh"
|
#include "base/range.hh"
|
||||||
#include "dev/io_device.hh"
|
#include "dev/io_device.hh"
|
||||||
|
|
||||||
|
class MemoryController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A very simple implementation of the Tsunami PCI interface chips.
|
* A very simple implementation of the Tsunami PCI interface chips.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -303,8 +303,8 @@ template void Param<type>::parse(const string &); \
|
||||||
template void VectorParam<type>::parse(const string &); \
|
template void VectorParam<type>::parse(const string &); \
|
||||||
template void Param<type>::showValue(ostream &) const; \
|
template void Param<type>::showValue(ostream &) const; \
|
||||||
template void VectorParam<type>::showValue(ostream &) const; \
|
template void VectorParam<type>::showValue(ostream &) const; \
|
||||||
void Param<type>::showType(ostream &os) const { os << typestr; } \
|
template <> void Param<type>::showType(ostream &os) const { os << typestr; } \
|
||||||
void VectorParam<type>::showType(ostream &os) const { \
|
template <> void VectorParam<type>::showType(ostream &os) const { \
|
||||||
os << "vector of " << typestr; \
|
os << "vector of " << typestr; \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue