diff options
| author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
| commit | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (patch) | |
| tree | 959d71e897a8d01868c8dea8a8b225cbd1b5ce2c /src/mem/gems_common | |
| parent | be10204729c107b41d5d7487323c732e9fa09df5 (diff) | |
| download | gem5-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/mem/gems_common')
| -rw-r--r-- | src/mem/gems_common/Vector.hh | 3 |
1 files changed, 2 insertions, 1 deletions
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 <algorithm> #include <cassert> #include <iostream> #include <vector> @@ -184,7 +185,7 @@ template <class TYPE> inline void Vector<TYPE>::sortVector() { - sort(&m_vec[0], &m_vec[m_size]); + std::sort(&m_vec[0], &m_vec[m_size]); } template <class TYPE> |