From 18fb295bcd100d17cc49147df20109226b6f7619 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Fri, 27 Aug 2021 09:49:22 -0700
Subject: [PATCH] sim: Explicitly specify the namespace of serialization
 helpers.

That makes them work when not calling from the gem5 namespace.

Change-Id: If238d837f91d2c1b8ca58c9c3e08aed8cb0af28a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49619
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/sim/serialize.hh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 9687423df9..15be41f8f0 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -598,7 +598,7 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
 #define UNSERIALIZE_ENUM(scalar)                        \
     do {                                                \
         int tmp;                                        \
-        paramIn(cp, #scalar, tmp);                      \
+        ::gem5::paramIn(cp, #scalar, tmp);              \
         scalar = static_cast<decltype(scalar)>(tmp);    \
     } while (0)
 
@@ -608,7 +608,7 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
  * @ingroup api_serialize
  */
 #define SERIALIZE_ARRAY(member, size)           \
-        arrayParamOut(cp, #member, member, size)
+        ::gem5::arrayParamOut(cp, #member, member, size)
 
 /**
  * \def UNSERIALIZE_ARRAY(member, size)
@@ -616,7 +616,7 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
  * @ingroup api_serialize
  */
 #define UNSERIALIZE_ARRAY(member, size)         \
-        arrayParamIn(cp, #member, member, size)
+        ::gem5::arrayParamIn(cp, #member, member, size)
 
 /**
  * \def SERIALIZE_CONTAINER(member)
@@ -624,7 +624,7 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
  * @ingroup api_serialize
  */
 #define SERIALIZE_CONTAINER(member)             \
-        arrayParamOut(cp, #member, member)
+        ::gem5::arrayParamOut(cp, #member, member)
 
 /**
  * \def UNSERIALIZE_CONTAINER(member)
@@ -632,7 +632,7 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
  * @ingroup api_serialize
  */
 #define UNSERIALIZE_CONTAINER(member)           \
-        arrayParamIn(cp, #member, member)
+        ::gem5::arrayParamIn(cp, #member, member)
 
 /**
  * \def SERIALIZE_OBJ(obj)
@@ -658,13 +658,13 @@ mappingParamIn(CheckpointIn &cp, const char* sectionName,
  * \def SERIALIZE_MAPPING(member, names, size)
  */
 #define SERIALIZE_MAPPING(member, names, size) \
-        mappingParamOut(cp, #member, names, member, size)
+        ::gem5::mappingParamOut(cp, #member, names, member, size)
 
 /**
  * \def UNSERIALIZE_MAPPING(member, names, size)
  */
 #define UNSERIALIZE_MAPPING(member, names, size) \
-        mappingParamIn(cp, #member, names, member, size)
+        ::gem5::mappingParamIn(cp, #member, names, member, size)
 
 } // namespace gem5