From f1c3f3044b73d890ffdfdd113b3b37ae2809d21b Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 2 Apr 2010 11:20:32 -0700 Subject: 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. --- src/mem/ruby/network/simple/Topology.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mem/ruby/network/simple/Topology.cc') diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index 3d7aa35d0..f21129255 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -36,6 +36,8 @@ #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/system/System.hh" +using namespace std; + const int INFINITE_LATENCY = 10000; // Yes, this is a big hack const int DEFAULT_BW_MULTIPLIER = 1; // Just to be consistent with above :) @@ -276,8 +278,6 @@ Topology::clearStats() void Topology::printConfig(std::ostream& out) const { - using namespace std; - if (m_print_config == false) return; -- cgit v1.2.3