Skip to content

Commit ce58f98

Browse files
authored
Fix conda build for gcc 14.3 (#565)
Signed-off-by: Adam Glustein <adam.glustein@point72.com>
1 parent 1268e86 commit ce58f98

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

cpp/csp/python/PyBasketInputProxy.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ static void PyListBasketInputProxy_dealloc( PyListBasketInputProxy * self )
265265
{
266266
CSP_BEGIN_METHOD;
267267
self -> ~PyListBasketInputProxy();
268-
Py_TYPE( self ) -> tp_free( self );
268+
PyListBasketInputProxy::PyType.tp_free( self );
269269
CSP_RETURN;
270270
}
271271

@@ -419,7 +419,7 @@ static void PyDictBasketInputProxy_dealloc( PyDictBasketInputProxy * self )
419419
{
420420
CSP_BEGIN_METHOD;
421421
self -> ~PyDictBasketInputProxy();
422-
Py_TYPE( self ) -> tp_free( self );
422+
PyDictBasketInputProxy::PyType.tp_free( self );
423423
CSP_RETURN;
424424
}
425425

@@ -643,7 +643,7 @@ static void PyDynamicBasketInputProxy_dealloc( PyDynamicBasketInputProxy * self
643643
{
644644
CSP_BEGIN_METHOD;
645645
self -> ~PyDynamicBasketInputProxy();
646-
Py_TYPE( self ) -> tp_free( self );
646+
PyDynamicBasketInputProxy::PyType.tp_free( self );
647647
CSP_RETURN;
648648
}
649649

cpp/csp/python/PyBasketOutputProxy.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static void PyListBasketOutputProxy_dealloc( PyListBasketOutputProxy * self )
3737
{
3838
CSP_BEGIN_METHOD;
3939
self -> ~PyListBasketOutputProxy();
40-
Py_TYPE( self ) -> tp_free( self );
40+
PyListBasketOutputProxy::PyType.tp_free( self );
4141
CSP_RETURN;
4242
}
4343

@@ -182,7 +182,7 @@ static void PyDictBasketOutputProxy_dealloc( PyDictBasketOutputProxy * self )
182182
{
183183
CSP_BEGIN_METHOD;
184184
self -> ~PyDictBasketOutputProxy();
185-
Py_TYPE( self ) -> tp_free( self );
185+
PyDictBasketOutputProxy::PyType.tp_free( self );
186186
CSP_RETURN;
187187
}
188188

@@ -306,7 +306,7 @@ static void PyDynamicBasketOutputProxy_dealloc( PyDynamicBasketOutputProxy * sel
306306
{
307307
CSP_BEGIN_METHOD;
308308
self -> ~PyDynamicBasketOutputProxy();
309-
Py_TYPE( self ) -> tp_free( self );
309+
PyDynamicBasketOutputProxy::PyType.tp_free( self );
310310
CSP_RETURN;
311311
}
312312

cpp/csp/python/PyCspEnum.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void PyCspEnumMeta_dealloc( PyCspEnumMeta * m )
116116
{
117117
CspTypeFactory::instance().removeCachedType( reinterpret_cast<PyTypeObject*>( m ) );
118118
m -> ~PyCspEnumMeta();
119-
Py_TYPE( m ) -> tp_free( m );
119+
PyCspEnumMeta::PyType.tp_free( m );
120120
}
121121

122122
PyObject * PyCspEnumMeta_subscript( PyCspEnumMeta * self, PyObject * key )
@@ -187,7 +187,7 @@ PyTypeObject PyCspEnumMeta::PyType = {
187187
void PyCspEnum_dealloc( PyCspEnum * self )
188188
{
189189
self -> ~PyCspEnum();
190-
Py_TYPE( self ) -> tp_free( self );
190+
PyCspEnum::PyType.tp_free( self );
191191
}
192192

193193
PyObject * PyCspEnum_new( PyTypeObject * type, PyObject *args, PyObject *kwds )

cpp/csp/python/PyOutputProxy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void PyOutputProxy_dealloc( PyOutputProxy * self )
2424
CSP_BEGIN_METHOD;
2525

2626
( self ) -> ~PyOutputProxy();
27-
Py_TYPE( self ) -> tp_free( self );
27+
PyOutputProxy::PyType.tp_free( self );
2828

2929
CSP_RETURN;
3030
}

cpp/csp/python/PyStruct.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void PyStructMeta_dealloc( PyStructMeta * m )
241241
{
242242
CspTypeFactory::instance().removeCachedType( reinterpret_cast<PyTypeObject*>( m ) );
243243
m -> ~PyStructMeta();
244-
Py_TYPE( m ) -> tp_free( m );
244+
PyStructMeta::PyType.tp_free( m );
245245
}
246246

247247
PyObject * PyStructMeta_layout( PyStructMeta * m )
@@ -768,7 +768,7 @@ void PyStruct_dealloc( PyStruct * self )
768768
self -> struct_ -> setDialectPtr( nullptr );
769769

770770
self -> ~PyStruct();
771-
Py_TYPE( self ) -> tp_free( self );
771+
PyStruct::PyType.tp_free( self );
772772
}
773773

774774
void PyStruct_setattrs( PyStruct * self, PyObject * args, PyObject * kwargs, const char * methodName )

cpp/tests/core/test_dynamicbitset.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <gtest/gtest.h>
22
#include <csp/core/DynamicBitSet.h>
3+
4+
#include <algorithm>
35
#include <unordered_set>
46
#include <random>
57
#include <vector>

0 commit comments

Comments
 (0)