From 9f80a883b3a4e5975436e836de31b37bf46682ab Mon Sep 17 00:00:00 2001
From: Adam Glustein <adam.glustein@point72.com>
Date: Thu, 24 Jul 2025 09:21:38 -0400
Subject: [PATCH] Fix conda build for gcc 14.3

Signed-off-by: Adam Glustein <adam.glustein@point72.com>
---
 cpp/csp/python/PyBasketInputProxy.cpp  | 6 +++---
 cpp/csp/python/PyBasketOutputProxy.cpp | 6 +++---
 cpp/csp/python/PyCspEnum.cpp           | 4 ++--
 cpp/csp/python/PyOutputProxy.cpp       | 2 +-
 cpp/csp/python/PyStruct.cpp            | 4 ++--
 cpp/tests/core/test_dynamicbitset.cpp  | 2 ++
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cpp/csp/python/PyBasketInputProxy.cpp b/cpp/csp/python/PyBasketInputProxy.cpp
index fa3b4bf44..2487f4f48 100644
--- a/cpp/csp/python/PyBasketInputProxy.cpp
+++ b/cpp/csp/python/PyBasketInputProxy.cpp
@@ -265,7 +265,7 @@ static void PyListBasketInputProxy_dealloc( PyListBasketInputProxy * self )
 {
     CSP_BEGIN_METHOD;
     self -> ~PyListBasketInputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyListBasketInputProxy::PyType.tp_free( self ); 
     CSP_RETURN;
 }
 
@@ -419,7 +419,7 @@ static void PyDictBasketInputProxy_dealloc( PyDictBasketInputProxy * self )
 {
     CSP_BEGIN_METHOD;
     self -> ~PyDictBasketInputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyDictBasketInputProxy::PyType.tp_free( self ); 
     CSP_RETURN;
 }
 
@@ -643,7 +643,7 @@ static void PyDynamicBasketInputProxy_dealloc( PyDynamicBasketInputProxy * self
 {
     CSP_BEGIN_METHOD;
     self -> ~PyDynamicBasketInputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyDynamicBasketInputProxy::PyType.tp_free( self ); 
     CSP_RETURN;
 }
 
diff --git a/cpp/csp/python/PyBasketOutputProxy.cpp b/cpp/csp/python/PyBasketOutputProxy.cpp
index 474d9e497..1f700197c 100644
--- a/cpp/csp/python/PyBasketOutputProxy.cpp
+++ b/cpp/csp/python/PyBasketOutputProxy.cpp
@@ -37,7 +37,7 @@ static void PyListBasketOutputProxy_dealloc( PyListBasketOutputProxy * self )
 {
     CSP_BEGIN_METHOD;
     self -> ~PyListBasketOutputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyListBasketOutputProxy::PyType.tp_free( self ); 
     CSP_RETURN;
 }
 
@@ -182,7 +182,7 @@ static void PyDictBasketOutputProxy_dealloc( PyDictBasketOutputProxy * self )
 {
     CSP_BEGIN_METHOD;
     self -> ~PyDictBasketOutputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyDictBasketOutputProxy::PyType.tp_free( self ); 
     CSP_RETURN;
 }
 
@@ -306,7 +306,7 @@ static void PyDynamicBasketOutputProxy_dealloc( PyDynamicBasketOutputProxy * sel
 {
     CSP_BEGIN_METHOD;
     self -> ~PyDynamicBasketOutputProxy();
-    Py_TYPE( self ) -> tp_free( self );
+    PyDynamicBasketOutputProxy::PyType.tp_free( self );
     CSP_RETURN;
 }
 
diff --git a/cpp/csp/python/PyCspEnum.cpp b/cpp/csp/python/PyCspEnum.cpp
index cf7c8269b..286598b1a 100644
--- a/cpp/csp/python/PyCspEnum.cpp
+++ b/cpp/csp/python/PyCspEnum.cpp
@@ -116,7 +116,7 @@ void PyCspEnumMeta_dealloc( PyCspEnumMeta * m )
 {
     CspTypeFactory::instance().removeCachedType( reinterpret_cast<PyTypeObject*>( m ) );
     m -> ~PyCspEnumMeta();
-    Py_TYPE( m ) -> tp_free( m );
+    PyCspEnumMeta::PyType.tp_free( m );
 }
 
 PyObject * PyCspEnumMeta_subscript( PyCspEnumMeta * self, PyObject * key )
@@ -187,7 +187,7 @@ PyTypeObject PyCspEnumMeta::PyType = {
 void PyCspEnum_dealloc( PyCspEnum * self )
 {
     self -> ~PyCspEnum();
-    Py_TYPE( self ) -> tp_free( self );
+    PyCspEnum::PyType.tp_free( self );
 }
 
 PyObject * PyCspEnum_new( PyTypeObject * type, PyObject *args, PyObject *kwds )
diff --git a/cpp/csp/python/PyOutputProxy.cpp b/cpp/csp/python/PyOutputProxy.cpp
index 2db235bf9..90adf2b16 100644
--- a/cpp/csp/python/PyOutputProxy.cpp
+++ b/cpp/csp/python/PyOutputProxy.cpp
@@ -24,7 +24,7 @@ static void PyOutputProxy_dealloc( PyOutputProxy * self )
     CSP_BEGIN_METHOD;
 
     ( self ) -> ~PyOutputProxy();
-    Py_TYPE( self ) -> tp_free( self ); 
+    PyOutputProxy::PyType.tp_free( self ); 
 
     CSP_RETURN;
 }
diff --git a/cpp/csp/python/PyStruct.cpp b/cpp/csp/python/PyStruct.cpp
index 4b00fe133..037e3f63a 100644
--- a/cpp/csp/python/PyStruct.cpp
+++ b/cpp/csp/python/PyStruct.cpp
@@ -241,7 +241,7 @@ void PyStructMeta_dealloc( PyStructMeta * m )
 {
     CspTypeFactory::instance().removeCachedType( reinterpret_cast<PyTypeObject*>( m ) );
     m -> ~PyStructMeta();
-    Py_TYPE( m ) -> tp_free( m );
+    PyStructMeta::PyType.tp_free( m );
 }
 
 PyObject * PyStructMeta_layout( PyStructMeta * m )
@@ -768,7 +768,7 @@ void PyStruct_dealloc( PyStruct * self )
     self -> struct_ -> setDialectPtr( nullptr );
 
     self -> ~PyStruct();
-    Py_TYPE( self ) -> tp_free( self );
+    PyStruct::PyType.tp_free( self );
 }
 
 void PyStruct_setattrs( PyStruct * self, PyObject * args, PyObject * kwargs, const char * methodName )
diff --git a/cpp/tests/core/test_dynamicbitset.cpp b/cpp/tests/core/test_dynamicbitset.cpp
index fbcd208a2..fb2a69ea1 100644
--- a/cpp/tests/core/test_dynamicbitset.cpp
+++ b/cpp/tests/core/test_dynamicbitset.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
 #include <csp/core/DynamicBitSet.h>
+
+#include <algorithm>
 #include <unordered_set>
 #include <random>
 #include <vector>