Delete old boost ifdeffery #1087
Conversation
The 1.28.0 version that those ifdefs check is from the distant past (2002) according to: https://www.boost.org/users/history
| inline PyObject * to_python( Vector vec ) | ||
| { | ||
| return to_python( boost::python::tuple( (double) vec.i, (double) vec.j, (double) vec.k ) ); | ||
| } | ||
| inline PyObject * to_python( QVector vec ) | ||
| { | ||
| return to_python( boost::python::tuple( (double) vec.i, (double) vec.j, (double) vec.k ) ); | ||
| } | ||
|
|
||
| inline Vector from_python( PyObject *p, boost::python::type< Vector >) | ||
| { | ||
| Vector vec( 0, 0, 0 ); | ||
| PyArg_ParseTuple( p, "fff", &vec.i, &vec.j, &vec.k ); | ||
| return vec; | ||
| } | ||
| inline QVector from_python( PyObject *p, boost::python::type< QVector >) | ||
| { | ||
| QVector vec( 0, 0, 0 ); | ||
| PyArg_ParseTuple( p, "ddd", &vec.i, &vec.j, &vec.k ); | ||
| return vec; | ||
| } | ||
| #endif //BOOST_VERSION != 102800 |
There was a problem hiding this comment.
I think there was a reason why this code was here. I'd rather not remove it without careful consideration.
Over time, I've gotten the impression that there were two separate embedded Python environments: the standard one, using Boost Python 1.73 or 1.87 or a similar recent version, and then a weird, internal-only Python environment, pinned at Boost Python 1.28. Some of these same source files may be reused between both.
I could be mistaken, or not quite correct. Either way, I'd like confirmation before we go deleting any code that might actually still be relevant.
There was a problem hiding this comment.
When we picked up VS in 2019 it was using Boost 1.53; the Mac build seemed to support 1.29 as well.
(Found this commit from @klaussfreire - https://github.com/stephengtuggy/Vega-Strike-Engine-Source/tree/36d551e2b812ee038f745b90a451abb6df667bdb - way back in Oct 2019.... wow we've come a long way since then...) There was also a copy of the boost libraries embedded in the source that we quickly removed in favor of just using the system versions.
I think it's safe to say we won't be supporting those older versions any more.
As a general rule, we need to look at what is available on the various platforms we're supporting, which is probably now driven by the Ubuntu LTS releases (22.04, 24.04), Debian (bookworm), or Rocky (9.5) more than anything else. Mac and Windows its mostly a matter of what we can get from Homebrew (Mac) and Nuget/Chocolatey (Windows) in our CI platforms.
| TO_PYTHON_SMART_POINTER( UnitWrapper ); | ||
| TO_PYTHON_SMART_POINTER( Cargo ); | ||
|
|
||
| PYTHON_INIT_GLOBALS( Unit, UnitWrapper ) | ||
| BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE | ||
| inline PyObject*to_python( Unit*un ) | ||
| { | ||
| return to_python( UnitWrapper( un ) ); | ||
| } | ||
| inline Unit * from_python( PyObject *p, boost::python::type< Unit* >) | ||
| { | ||
| UnitWrapper uw = ( from_python( p, boost::python::type< UnitWrapper& > () ) ); | ||
| return uw.GetUnit(); | ||
| } |
There was a problem hiding this comment.
This is another block that I'm thinking maybe we should keep.
There was a problem hiding this comment.
Let's continue the conversation with @stephengtuggy regarding some of the code-blocks and resolve those before merging.
But from my perspective it's good to go.
|
@vincele are you still in the loop or should I take over? |
|
@royfalk you can go ahead and take over |
|
@royfalk No, neither of the sections noted should be removed, in my opinion. The best way to move forward would probably be to get some input from one or more members of the original development team -- find out which Python versions they were using, and how, and why. |
Code Changes:
Issues:
Purpose:
Closes: #797