Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GCC 12 C++20 mode #42

Open
wants to merge 1 commit into
base: release/104.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion physx/source/common/src/CmPreallocatingPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ template<class T>
class BufferedPreallocatingPool : public PreallocatingPool<T>
{
PxArray<T*> mDeletedElems;
PX_NOCOPY(BufferedPreallocatingPool<T>)
PX_NOCOPY(BufferedPreallocatingPool)
public:
BufferedPreallocatingPool(PxU32 maxElements, const char* typeName) : PreallocatingPool<T>(maxElements, typeName)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ template<typename TEnumType, typename TStorageType>
struct IsFlagsType<PxFlags<TEnumType, TStorageType> >
{
const PxU32ToName* FlagData;
IsFlagsType<PxFlags<TEnumType, TStorageType> > () : FlagData( PxEnumTraits<TEnumType>().NameConversion ) {}
IsFlagsType() : FlagData( PxEnumTraits<TEnumType>().NameConversion ) {}
};


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ struct PxPropertyToValueStructMemberMap
template<> struct PxPropertyToValueStructMemberMap< PxPropertyInfoName::type##_##prop > \
{ \
PxU32 Offset; \
PxPropertyToValueStructMemberMap< PxPropertyInfoName::type##_##prop >() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
PxPropertyToValueStructMemberMap() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
template<typename TOperator> void visitProp( TOperator inOperator, valueStruct& inStruct ) { inOperator( inStruct.prop ); } \
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct PxExtensionsPropertyInfoName
template<> struct PxPropertyToValueStructMemberMap< PxExtensionsPropertyInfoName::type##_##prop > \
{ \
PxU32 Offset; \
PxPropertyToValueStructMemberMap< PxExtensionsPropertyInfoName::type##_##prop >() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
PxPropertyToValueStructMemberMap() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
template<typename TOperator> void visitProp( TOperator inOperator, valueStruct& inStruct ) { inOperator( inStruct.prop ); } \
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct PxVehiclePropertyInfoName
template<> struct PxPropertyToValueStructMemberMap< PxVehiclePropertyInfoName::type##_##prop > \
{ \
PxU32 Offset; \
PxPropertyToValueStructMemberMap< PxVehiclePropertyInfoName::type##_##prop >() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
PxPropertyToValueStructMemberMap() : Offset( PX_OFFSET_OF_RT( valueStruct, prop ) ) {} \
template<typename TOperator> void visitProp( TOperator inOperator, valueStruct& inStruct ) { inOperator( inStruct.prop ); } \
};

Expand Down
8 changes: 4 additions & 4 deletions physx/source/pvd/include/PxPvdObjectModelBaseTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,15 @@ struct PvdDataTypeToNamespacedNameMap
struct PvdDataTypeToNamespacedNameMap<type> \
{ \
NamespacedName Name; \
PvdDataTypeToNamespacedNameMap<type>() : Name("physx3", #type) \
PvdDataTypeToNamespacedNameMap() : Name("physx3", #type) \
{ \
} \
}; \
template <> \
struct PvdDataTypeToNamespacedNameMap<const type&> \
{ \
NamespacedName Name; \
PvdDataTypeToNamespacedNameMap<const type&>() : Name("physx3", #type) \
PvdDataTypeToNamespacedNameMap() : Name("physx3", #type) \
{ \
} \
};
Expand All @@ -286,7 +286,7 @@ inline NamespacedName getPvdNamespacedNameForType()
struct PvdDataTypeToNamespacedNameMap<type> \
{ \
NamespacedName Name; \
PvdDataTypeToNamespacedNameMap<type>() : Name(ns, name) \
PvdDataTypeToNamespacedNameMap() : Name(ns, name) \
{ \
} \
};
Expand All @@ -296,7 +296,7 @@ inline NamespacedName getPvdNamespacedNameForType()
struct PvdDataTypeToNamespacedNameMap<newType> \
{ \
NamespacedName Name; \
PvdDataTypeToNamespacedNameMap<newType>() : Name(PvdDataTypeToNamespacedNameMap<oldType>().Name) \
PvdDataTypeToNamespacedNameMap() : Name(PvdDataTypeToNamespacedNameMap<oldType>().Name) \
{ \
} \
};
Expand Down
2 changes: 1 addition & 1 deletion physx/source/pvd/src/PxProfileZoneImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace physx { namespace profile {
PxProfileArray<PxProfileZoneClient*> mZoneClients;
volatile bool mEventsActive;

PX_NOCOPY(ZoneImpl<TNameProvider>)
PX_NOCOPY(ZoneImpl)
public:
ZoneImpl( PxAllocatorCallback* inAllocator, const char* inName, uint32_t bufferSize = 0x10000 /*64k*/, const TNameProvider& inProvider = TNameProvider() )
: TZoneEventBufferType( inAllocator, bufferSize, PxDefaultContextProvider(), NULL, PxProfileNullEventFilter() )
Expand Down
2 changes: 1 addition & 1 deletion physx/source/pvd/src/PxPvdObjectModelInternalTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct PvdTypeToDataTypeMap
struct PvdDataTypeToNamespacedNameMap<type> \
{ \
NamespacedName Name; \
PvdDataTypeToNamespacedNameMap<type>() : Name("physx3_debugger_internal", #type) \
PvdDataTypeToNamespacedNameMap() : Name("physx3_debugger_internal", #type) \
{ \
} \
};
Expand Down