summaryrefslogtreecommitdiff
path: root/src/cpu/rubytest
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2010-04-02 11:20:32 -0700
committerNathan Binkert <nate@binkert.org>2010-04-02 11:20:32 -0700
commitf1c3f3044b73d890ffdfdd113b3b37ae2809d21b (patch)
tree959d71e897a8d01868c8dea8a8b225cbd1b5ce2c /src/cpu/rubytest
parentbe10204729c107b41d5d7487323c732e9fa09df5 (diff)
downloadgem5-f1c3f3044b73d890ffdfdd113b3b37ae2809d21b.tar.xz
ruby: get "using namespace" out of headers
In addition to obvious changes, this required a slight change to the slicc grammar to allow types with :: in them. Otherwise slicc barfs on std::string which we need for the headers that slicc generates.
Diffstat (limited to 'src/cpu/rubytest')
-rw-r--r--src/cpu/rubytest/Check.cc4
-rw-r--r--src/cpu/rubytest/Check.hh10
-rw-r--r--src/cpu/rubytest/CheckTable.cc2
-rw-r--r--src/cpu/rubytest/RubyTester.cc4
-rw-r--r--src/cpu/rubytest/RubyTester.hh15
5 files changed, 20 insertions, 15 deletions
diff --git a/src/cpu/rubytest/Check.cc b/src/cpu/rubytest/Check.cc
index ca7ca8457..867e755a8 100644
--- a/src/cpu/rubytest/Check.cc
+++ b/src/cpu/rubytest/Check.cc
@@ -334,7 +334,7 @@ Check::pickInitiatingNode()
}
void
-Check::print(ostream& out) const
+Check::print(std::ostream& out) const
{
out << "["
<< m_address << ", value: "
@@ -342,7 +342,7 @@ Check::print(ostream& out) const
<< m_status << ", initiating node: "
<< m_initiatingNode << ", store_count: "
<< m_store_count
- << "]" << flush;
+ << "]" << std::flush;
}
void
diff --git a/src/cpu/rubytest/Check.hh b/src/cpu/rubytest/Check.hh
index 5f621a018..6d41dfc59 100644
--- a/src/cpu/rubytest/Check.hh
+++ b/src/cpu/rubytest/Check.hh
@@ -30,6 +30,8 @@
#ifndef __CPU_RUBYTEST_CHECK_HH__
#define __CPU_RUBYTEST_CHECK_HH__
+#include <iostream>
+
#include "cpu/rubytest/RubyTester.hh"
#include "mem/protocol/AccessModeType.hh"
#include "mem/protocol/TesterStatus.hh"
@@ -53,7 +55,7 @@ class Check
const Address& getAddress() { return m_address; }
void changeAddress(const Address& address);
- void print(ostream& out) const;
+ void print(std::ostream& out) const;
private:
void initiatePrefetch();
@@ -76,11 +78,11 @@ class Check
RubyTester* m_tester_ptr;
};
-inline ostream&
-operator<<(ostream& out, const Check& obj)
+inline std::ostream&
+operator<<(std::ostream& out, const Check& obj)
{
obj.print(out);
- out << flush;
+ out << std::flush;
return out;
}
diff --git a/src/cpu/rubytest/CheckTable.cc b/src/cpu/rubytest/CheckTable.cc
index 875b4b31e..1674ca234 100644
--- a/src/cpu/rubytest/CheckTable.cc
+++ b/src/cpu/rubytest/CheckTable.cc
@@ -126,6 +126,6 @@ CheckTable::getCheck(const Address& address)
}
void
-CheckTable::print(ostream& out) const
+CheckTable::print(std::ostream& out) const
{
}
diff --git a/src/cpu/rubytest/RubyTester.cc b/src/cpu/rubytest/RubyTester.cc
index b2af22a6e..3ad977b42 100644
--- a/src/cpu/rubytest/RubyTester.cc
+++ b/src/cpu/rubytest/RubyTester.cc
@@ -183,9 +183,9 @@ RubyTester::checkForDeadlock()
}
void
-RubyTester::print(ostream& out) const
+RubyTester::print(std::ostream& out) const
{
- out << "[RubyTester]" << endl;
+ out << "[RubyTester]" << std::endl;
}
RubyTester *
diff --git a/src/cpu/rubytest/RubyTester.hh b/src/cpu/rubytest/RubyTester.hh
index f4cf4a04d..634e61f88 100644
--- a/src/cpu/rubytest/RubyTester.hh
+++ b/src/cpu/rubytest/RubyTester.hh
@@ -30,6 +30,9 @@
#ifndef __CPU_RUBYTEST_RUBYTESTER_HH__
#define __CPU_RUBYTEST_RUBYTESTER_HH__
+#include <iostream>
+#include <string>
+
#include "cpu/rubytest/CheckTable.hh"
#include "mem/mem_object.hh"
#include "mem/packet.hh"
@@ -91,11 +94,11 @@ class RubyTester : public MemObject
void incrementCheckCompletions() { m_checks_completed++; }
- void printStats(ostream& out) const {}
+ void printStats(std::ostream& out) const {}
void clearStats() {}
- void printConfig(ostream& out) const {}
+ void printConfig(std::ostream& out) const {}
- void print(ostream& out) const;
+ void print(std::ostream& out) const;
protected:
class CheckStartEvent : public Event
@@ -133,11 +136,11 @@ class RubyTester : public MemObject
int m_wakeup_frequency;
};
-inline ostream&
-operator<<(ostream& out, const RubyTester& obj)
+inline std::ostream&
+operator<<(std::ostream& out, const RubyTester& obj)
{
obj.print(out);
- out << flush;
+ out << std::flush;
return out;
}