diff options
| -rw-r--r-- | arch/alpha/tlb.cc | 1 | ||||
| -rw-r--r-- | base/cprintf.hh | 5 | ||||
| -rw-r--r-- | base/cprintf_formats.hh | 7 | ||||
| -rw-r--r-- | base/crc.cc | 1 | ||||
| -rw-r--r-- | base/statistics.cc | 1 | ||||
| -rw-r--r-- | base/statistics.hh | 1 | ||||
| -rw-r--r-- | base/stats/text.cc | 1 | ||||
| -rw-r--r-- | cpu/memtest/memtest.cc | 1 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 1 | ||||
| -rw-r--r-- | dev/pcidev.cc | 1 | ||||
| -rw-r--r-- | sim/eventq.cc | 1 |
11 files changed, 10 insertions, 11 deletions
diff --git a/arch/alpha/tlb.cc b/arch/alpha/tlb.cc index 877822c31..05b02d74b 100644 --- a/arch/alpha/tlb.cc +++ b/arch/alpha/tlb.cc @@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sstream> #include <string> #include <vector> diff --git a/base/cprintf.hh b/base/cprintf.hh index dcb292434..c468c375f 100644 --- a/base/cprintf.hh +++ b/base/cprintf.hh @@ -31,13 +31,12 @@ #include <iostream> #include <list> -#include <sstream> #include <string> -namespace cp { - #include "base/cprintf_formats.hh" +namespace cp { + class ArgList { private: diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh index 11b0238ed..05a8723a4 100644 --- a/base/cprintf_formats.hh +++ b/base/cprintf_formats.hh @@ -29,6 +29,11 @@ #ifndef __CPRINTF_FORMATS_HH__ #define __CPRINTF_FORMATS_HH__ +#include <sstream> +#include <ostream> + +namespace cp { + struct Format { bool alternate_form; @@ -343,4 +348,6 @@ inline void format_string(std::ostream &out, const std::stringstream &data, Format &fmt) { _format_string(out, data.str(), fmt); } +} // namespace cp + #endif // __CPRINTF_FORMATS_HH__ diff --git a/base/crc.cc b/base/crc.cc index 87963ef14..08f039577 100644 --- a/base/crc.cc +++ b/base/crc.cc @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sstream> #include <string> #include "sim/host.hh" diff --git a/base/statistics.cc b/base/statistics.cc index c97564641..20de46347 100644 --- a/base/statistics.cc +++ b/base/statistics.cc @@ -31,7 +31,6 @@ #include <list> #include <map> #include <string> -#include <sstream> #include "base/callback.hh" #include "base/cprintf.hh" diff --git a/base/statistics.hh b/base/statistics.hh index c46744cac..dd507c091 100644 --- a/base/statistics.hh +++ b/base/statistics.hh @@ -50,7 +50,6 @@ #include <cmath> #include <functional> #include <iosfwd> -#include <sstream> #include <string> #include <vector> diff --git a/base/stats/text.cc b/base/stats/text.cc index 3d77ff87d..300737c60 100644 --- a/base/stats/text.cc +++ b/base/stats/text.cc @@ -31,6 +31,7 @@ #endif #include <iostream> +#include <sstream> #include <fstream> #include <string> diff --git a/cpu/memtest/memtest.cc b/cpu/memtest/memtest.cc index 94b66b70b..54def1012 100644 --- a/cpu/memtest/memtest.cc +++ b/cpu/memtest/memtest.cc @@ -30,7 +30,6 @@ #include <iomanip> #include <set> -#include <sstream> #include <string> #include <vector> diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 33fe63c26..cb077e26c 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -32,7 +32,6 @@ #include <iostream> #include <iomanip> #include <list> -#include <sstream> #include <string> #include "arch/utility.hh" diff --git a/dev/pcidev.cc b/dev/pcidev.cc index c40ef62e4..76392ccfe 100644 --- a/dev/pcidev.cc +++ b/dev/pcidev.cc @@ -31,7 +31,6 @@ */ #include <list> -#include <sstream> #include <string> #include <vector> diff --git a/sim/eventq.cc b/sim/eventq.cc index 0884db994..4bfd6face 100644 --- a/sim/eventq.cc +++ b/sim/eventq.cc @@ -30,7 +30,6 @@ #include <iostream> #include <string> -#include <sstream> #include <vector> #include "cpu/smt.hh" |