Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49619 )
Change subject: sim: Explicitly specify the namespace of serialization
helpers.
......................................................................
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...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/sim/serialize.hh
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 9687423..15be41f 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -598,7 +598,7 @@
#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 @@
* @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 @@
* @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 @@
* @ingroup api_serialize
*/
#define SERIALIZE_CONTAINER(member) \
- arrayParamOut(cp, #member, member)
+ ::gem5::arrayParamOut(cp, #member, member)
/**
* \def UNSERIALIZE_CONTAINER(member)
@@ -632,7 +632,7 @@
* @ingroup api_serialize
*/
#define UNSERIALIZE_CONTAINER(member) \
- arrayParamIn(cp, #member, member)
+ ::gem5::arrayParamIn(cp, #member, member)
/**
* \def SERIALIZE_OBJ(obj)
@@ -658,13 +658,13 @@
* \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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49619
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If238d837f91d2c1b8ca58c9c3e08aed8cb0af28a
Gerrit-Change-Number: 49619
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby Bruce <ucdavis.gem5.gcl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Jui-min Lee <f...@google.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
