diff options
| -rw-r--r-- | src/base/circular_queue.hh | 2 | ||||
| -rw-r--r-- | src/systemc/SConscript | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/base/circular_queue.hh b/src/base/circular_queue.hh index ff7f73dc1..5023661b9 100644 --- a/src/base/circular_queue.hh +++ b/src/base/circular_queue.hh @@ -394,7 +394,7 @@ class CircularQueue : private std::vector<T> }; public: - using typename Base::operator[]; + using Base::operator[]; explicit CircularQueue(uint32_t size = 0) : _capacity(size), _head(1), _tail(0), _empty(true), _round(0) diff --git a/src/systemc/SConscript b/src/systemc/SConscript index 694ee56b3..7317b3a82 100644 --- a/src/systemc/SConscript +++ b/src/systemc/SConscript @@ -31,7 +31,9 @@ from m5.util import compareVersions from m5.util.terminal import termcap if env['USE_SYSTEMC']: - if compareVersions(env['GCC_VERSION'], '5.0') < 0: + if 'GCC_VERSION' in env and \ + compareVersions(env['GCC_VERSION'], '5.0') < 0: + print(termcap.Yellow + termcap.Bold + 'Warning: Disabling systemc on gcc versions less than 5.0.' + termcap.Normal) |