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/gems_common/Vector.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mem/gems_common') diff --git a/src/mem/gems_common/Vector.hh b/src/mem/gems_common/Vector.hh index e10849213..ddba7a2fc 100644 --- a/src/mem/gems_common/Vector.hh +++ b/src/mem/gems_common/Vector.hh @@ -38,6 +38,7 @@ #ifndef VECTOR_H #define VECTOR_H +#include #include #include #include @@ -184,7 +185,7 @@ template inline void Vector::sortVector() { - sort(&m_vec[0], &m_vec[m_size]); + std::sort(&m_vec[0], &m_vec[m_size]); } template -- cgit v1.2.3