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/ide_ctrl.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/ide_ctrl.cc')
| -rw-r--r-- | src/dev/ide_ctrl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc index 5a663bac9..f33d603af 100644 --- a/src/dev/ide_ctrl.cc +++ b/src/dev/ide_ctrl.cc @@ -32,7 +32,6 @@ #include <string> -#include "base/trace.hh" #include "cpu/intr_control.hh" #include "debug/IdeCtrl.hh" #include "dev/ide_ctrl.hh" @@ -42,7 +41,9 @@ #include "params/IdeController.hh" #include "sim/byteswap.hh" -using namespace std; +// clang complains about std::set being overloaded with Packet::set if +// we open up the entire namespace std +using std::string; // Bus master IDE registers enum BMIRegOffset { |