From c4b85d5f9854abeee6d1dbe15ae65a7a1aada6b2 Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <andreas.sandberg@arm.com>
Date: Thu, 18 May 2017 15:11:23 +0100
Subject: base, sim, arch: Fix clang 5.0 warnings

Compiling gem5 with recent version of clang (4 and 5) triggers
warnings that are treated as errors:

  * Global templatized static functions result in a warning if they
    are not used. These should either be declared as static inline or
    without the static identifier to avoid the warning.

  * Some templatized classes contain static variables. The
    instantiated versions of these variables / templates need to be
    explicitly declared to avoid a compiler warning.

Change-Id: Ie8261144836e94ebab7ea04ccccb90927672c257
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/3420
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
---
 src/base/circlebuf.hh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/base')

diff --git a/src/base/circlebuf.hh b/src/base/circlebuf.hh
index 2ab14e269..bf6f9e263 100644
--- a/src/base/circlebuf.hh
+++ b/src/base/circlebuf.hh
@@ -247,7 +247,7 @@ class Fifo
 
 
 template <typename T>
-static void
+void
 arrayParamOut(CheckpointOut &cp, const std::string &name,
               const CircleBuf<T> &param)
 {
@@ -257,7 +257,7 @@ arrayParamOut(CheckpointOut &cp, const std::string &name,
 }
 
 template <typename T>
-static void
+void
 arrayParamIn(CheckpointIn &cp, const std::string &name,
              CircleBuf<T> &param)
 {
@@ -269,7 +269,7 @@ arrayParamIn(CheckpointIn &cp, const std::string &name,
 }
 
 template <typename T>
-static void
+void
 arrayParamOut(CheckpointOut &cp, const std::string &name,
               const Fifo<T> &param)
 {
@@ -279,7 +279,7 @@ arrayParamOut(CheckpointOut &cp, const std::string &name,
 }
 
 template <typename T>
-static void
+void
 arrayParamIn(CheckpointIn &cp, const std::string &name,
              Fifo<T> &param)
 {
-- 
cgit v1.2.3