Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49411 )
Change subject: sim: Remove some code for python versions less than 3.
......................................................................
sim: Remove some code for python versions less than 3.
We no longer support those versions of python.
Change-Id: I8f7312d8c252e4491525aa13c7d091467b96af6b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49411
Tested-by: kokoro <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M src/sim/init.cc
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
kokoro: Regressions pass
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 634c716..afecd73 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -189,11 +189,7 @@
return objs;
}
-#if PY_MAJOR_VERSION >= 3
PyObject *
-#else
-void
-#endif
EmbeddedPyBind::initAll()
{
std::list<EmbeddedPyBind *> pending;
@@ -228,9 +224,7 @@
}
}
-#if PY_MAJOR_VERSION >= 3
return m_m5.ptr();
-#endif
}
void
@@ -266,7 +260,6 @@
#endif
-#if PY_MAJOR_VERSION >= 3
typedef std::unique_ptr<wchar_t[], decltype(&PyMem_RawFree)> WArgUPtr;
std::vector<WArgUPtr> v_argv;
std::vector<wchar_t *> vp_argv;
@@ -278,9 +271,6 @@
}
wchar_t **argv = vp_argv.data();
-#else
- char **argv = _argv;
-#endif
PySys_SetArgv(argc, argv);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49411
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: I8f7312d8c252e4491525aa13c7d091467b96af6b
Gerrit-Change-Number: 49411
Gerrit-PatchSet: 5
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
