diff --git a/src/sim/init.cc b/src/sim/init.cc index 634c71634b..afecd73255 100644 --- a/src/sim/init.cc +++ b/src/sim/init.cc @@ -189,11 +189,7 @@ EmbeddedPyBind::getMap() return objs; } -#if PY_MAJOR_VERSION >= 3 PyObject * -#else -void -#endif EmbeddedPyBind::initAll() { std::list pending; @@ -228,9 +224,7 @@ EmbeddedPyBind::initAll() } } -#if PY_MAJOR_VERSION >= 3 return m_m5.ptr(); -#endif } void @@ -266,7 +260,6 @@ m5Main(int argc, char **_argv) #endif -#if PY_MAJOR_VERSION >= 3 typedef std::unique_ptr WArgUPtr; std::vector v_argv; std::vector vp_argv; @@ -278,9 +271,6 @@ m5Main(int argc, char **_argv) } wchar_t **argv = vp_argv.data(); -#else - char **argv = _argv; -#endif PySys_SetArgv(argc, argv);