diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
| commit | aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d (patch) | |
| tree | f48c9d361d04cc6276ef33a9898eb0ac61de36d7 /dev/pcidev.hh | |
| parent | 783f701247a1013a32d7caab324660c211215a11 (diff) | |
| parent | f31a27a030d2e93fef2934aa8642609bb38974af (diff) | |
| download | gem5-aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d.tar.xz | |
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Diffstat (limited to 'dev/pcidev.hh')
| -rw-r--r-- | dev/pcidev.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dev/pcidev.hh b/dev/pcidev.hh index 4b947b560..14f183e28 100644 --- a/dev/pcidev.hh +++ b/dev/pcidev.hh @@ -78,10 +78,6 @@ class PciConfigData : public SimObject */ class PciDev : public DmaDevice { - protected: - struct Params; - Params *_params; - public: struct Params { @@ -110,6 +106,11 @@ class PciDev : public DmaDevice /** The function number */ uint32_t functionNum; }; + + protected: + Params *_params; + + public: const Params *params() const { return _params; } protected: |