diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
| commit | 0358ccee23072eef0b6448e3170457037682a452 (patch) | |
| tree | 378b5ba325d74536092a7f245423d81274db38b4 /src/dev/pcidev.hh | |
| parent | e41f54f97f9ebdea32cc6498c346636cddc9e06d (diff) | |
| parent | 5c7bf74c073d0aea808046d10dfcaa6c319217a3 (diff) | |
| download | gem5-0358ccee23072eef0b6448e3170457037682a452.tar.xz | |
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/system.cc:
Hand Merge
--HG--
extra : convert_revision : d5e0c97caebb616493e2f642e915969d7028109c
Diffstat (limited to 'src/dev/pcidev.hh')
| -rw-r--r-- | src/dev/pcidev.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh index fbfdbb65c..56e3ffb4a 100644 --- a/src/dev/pcidev.hh +++ b/src/dev/pcidev.hh @@ -37,6 +37,8 @@ #ifndef __DEV_PCIDEV_HH__ #define __DEV_PCIDEV_HH__ +#include <cstring> + #include "dev/io_device.hh" #include "dev/pcireg.h" #include "dev/platform.hh" @@ -62,8 +64,8 @@ class PciConfigData : public SimObject PciConfigData(const std::string &name) : SimObject(name) { - memset(config.data, 0, sizeof(config.data)); - memset(BARSize, 0, sizeof(BARSize)); + std::memset(config.data, 0, sizeof(config.data)); + std::memset(BARSize, 0, sizeof(BARSize)); } /** The first 64 bytes */ |