Many files:

Fix sstream includes arch/alpha/tlb.cc: base/cprintf.hh: base/cprintf_formats.hh: base/crc.cc: base/statistics.cc: base/statistics.hh: base/stats/text.cc: cpu/memtest/memtest.cc: cpu/simple/cpu.cc: dev/pcidev.cc: sim/eventq.cc: Fix sstream includes --HG-- extra : convert_revision : fd69937ea26b4961e92f1736fa44daa16f54698d
2006-05-15 20:06:42 -04:00
parent 7d3eb0fe80
commit 2d9b7846c6
11 changed files with 10 additions and 11 deletions
--- 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>

--- 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:
--- 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__
--- a/base/crc.cc
+++ b/base/crc.cc
@@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

-#include <sstream>
 #include <string>

 #include "sim/host.hh"
--- 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"
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -50,7 +50,6 @@
 #include <cmath>
 #include <functional>
 #include <iosfwd>
-#include <sstream>
 #include <string>
 #include <vector>

--- a/base/stats/text.cc
+++ b/base/stats/text.cc
@@ -31,6 +31,7 @@
 #endif

 #include <iostream>
+#include <sstream>
 #include <fstream>
 #include <string>

--- a/cpu/memtest/memtest.cc
+++ b/cpu/memtest/memtest.cc
@@ -30,7 +30,6 @@

 #include <iomanip>
 #include <set>
-#include <sstream>
 #include <string>
 #include <vector>

--- 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"
--- a/dev/pcidev.cc
+++ b/dev/pcidev.cc
@@ -31,7 +31,6 @@
 */

 #include <list>
-#include <sstream>
 #include <string>
 #include <vector>

--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -30,7 +30,6 @@

 #include <iostream>
 #include <string>
-#include <sstream>
 #include <vector>

 #include "cpu/smt.hh"