diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
| commit | ea8b347dc5d375572d8d19770024ec8be5fd5017 (patch) | |
| tree | 56bb75b1f071a749b7e90218d0d6b0e9265657bb /src/dev/pcidev.cc | |
| parent | e88165a431a90cf7e33e205794caed898ca6fcb1 (diff) | |
| parent | 7d4f18770073d968c70cd3ffcdd117f50a6056a2 (diff) | |
| download | gem5-ea8b347dc5d375572d8d19770024ec8be5fd5017.tar.xz | |
Merge with head, hopefully the last time for this batch.
Diffstat (limited to 'src/dev/pcidev.cc')
| -rw-r--r-- | src/dev/pcidev.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc index 42c803553..cb27f8b3d 100644 --- a/src/dev/pcidev.cc +++ b/src/dev/pcidev.cc @@ -52,8 +52,6 @@ #include "sim/byteswap.hh" #include "sim/core.hh" -using namespace std; - PciDev::PciConfigPort::PciConfigPort(PciDev *dev, int busid, int devid, int funcid, Platform *p) @@ -341,7 +339,7 @@ PciDev::writeConfig(PacketPtr pkt) } void -PciDev::serialize(ostream &os) +PciDev::serialize(std::ostream &os) { SERIALIZE_ARRAY(BARSize, sizeof(BARSize) / sizeof(BARSize[0])); SERIALIZE_ARRAY(BARAddrs, sizeof(BARAddrs) / sizeof(BARAddrs[0])); |