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

diff --git a/base/mysql.hh b/base/mysql.hh
index 2278d42e7cc30378512af6cd79339c0f6934feb5..ae28a9dfb4021ada804e9cb8d9c3f550fa1a91a0 100644 (file)
--- 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 13092df2c7e83663c711a52213f83bf42e929103..d3993179772e98229cac63ff1789cd7c81e13271 100644 (file)
--- 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 dbbada40edd17fd1b46c1a1179c390db5e3bfc15..069ba734f8f1bfb2f6bfc9442760e2567819bbc5 100644 (file)
--- 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 072a763f9814ca6c0371c6d3725c8b2fb5282e96..d9e623b7ebf5b6e5ae28e383a5a31050b24cedff 100644 (file)
--- 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 931a0fb417c52ffe9e531caafeabe801a05b4634..e5da3984c6f63cc96f56085ff5a4f207705c1929 100644 (file)
--- 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 35a417e6eadda964318f159bc993a707cc63818c..1187f59040bc613577e207f1941940ff261839d7 100644 (file)
--- 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 63ea67b1dc781be007ed2f8e4002c28920e7bbfa..8c29a9ac9e508a4ea76697f7decd112bd1945cb9 100644 (file)
--- 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 396fde3acb5782b5bd78063329ed99c2d2aeb034..bc81881d3a3778619a79c5bb5157246667d2bded 100644 (file)
--- 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