fixing AzCore for linux/windows virtual warn
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
@@ -196,14 +196,14 @@ namespace AZ
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// ComponentApplicationRequests
|
||||
void RegisterComponentDescriptor(const ComponentDescriptor* descriptor) override final;
|
||||
void UnregisterComponentDescriptor(const ComponentDescriptor* descriptor) override final;
|
||||
void RegisterEntityAddedEventHandler(EntityAddedEvent::Handler& handler) override final;
|
||||
void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler& handler) override final;
|
||||
void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler& handler) override final;
|
||||
void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler& handler) override final;
|
||||
void SignalEntityActivated(Entity* entity) override final;
|
||||
void SignalEntityDeactivated(Entity* entity) override final;
|
||||
void RegisterComponentDescriptor(const ComponentDescriptor* descriptor) final;
|
||||
void UnregisterComponentDescriptor(const ComponentDescriptor* descriptor) final;
|
||||
void RegisterEntityAddedEventHandler(EntityAddedEvent::Handler& handler) final;
|
||||
void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler& handler) final;
|
||||
void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler& handler) final;
|
||||
void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler& handler) final;
|
||||
void SignalEntityActivated(Entity* entity) final;
|
||||
void SignalEntityDeactivated(Entity* entity) final;
|
||||
bool AddEntity(Entity* entity) override;
|
||||
bool RemoveEntity(Entity* entity) override;
|
||||
bool DeleteEntity(const EntityId& id) override;
|
||||
|
||||
@@ -28,21 +28,21 @@ namespace AZ
|
||||
protected:
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Driller
|
||||
virtual const char* GroupName() const { return "SystemDrillers"; }
|
||||
virtual const char* GetName() const { return "TraceMessagesDriller"; }
|
||||
virtual const char* GetDescription() const { return "Handles all system messages like Assert, Exception, Error, Warning, Printf, etc."; }
|
||||
virtual void Start(const Param* params = NULL, int numParams = 0);
|
||||
virtual void Stop();
|
||||
const char* GroupName() const override { return "SystemDrillers"; }
|
||||
const char* GetName() const override { return "TraceMessagesDriller"; }
|
||||
const char* GetDescription() const override { return "Handles all system messages like Assert, Exception, Error, Warning, Printf, etc."; }
|
||||
void Start(const Param* params = NULL, int numParams = 0) override;
|
||||
void Stop() override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// TraceMessagesDrillerBus
|
||||
/// Triggered when a AZ_Assert failed. This is terminating event! (the code will break, crash).
|
||||
virtual void OnAssert(const char* message);
|
||||
virtual void OnException(const char* message);
|
||||
virtual void OnError(const char* window, const char* message);
|
||||
virtual void OnWarning(const char* window, const char* message);
|
||||
virtual void OnPrintf(const char* window, const char* message);
|
||||
void OnAssert(const char* message) override;
|
||||
void OnException(const char* message) override;
|
||||
void OnError(const char* window, const char* message) override;
|
||||
void OnWarning(const char* window, const char* message) override;
|
||||
void OnPrintf(const char* window, const char* message) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
};
|
||||
} // namespace Debug
|
||||
|
||||
@@ -443,7 +443,7 @@ namespace AZ
|
||||
const unsigned char* GetData() const { return m_data.data(); }
|
||||
unsigned int GetDataSize() const { return static_cast<unsigned int>(m_data.size()); }
|
||||
inline void Reset() { m_data.clear(); }
|
||||
virtual void WriteBinary(const void* data, unsigned int dataSize)
|
||||
void WriteBinary(const void* data, unsigned int dataSize) override
|
||||
{
|
||||
m_data.insert(m_data.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + dataSize);
|
||||
}
|
||||
@@ -489,7 +489,7 @@ namespace AZ
|
||||
}
|
||||
|
||||
unsigned int GetDataLeft() const { return static_cast<unsigned int>(m_dataEnd - m_data); }
|
||||
virtual unsigned int ReadBinary(void* data, unsigned int maxDataSize)
|
||||
unsigned int ReadBinary(void* data, unsigned int maxDataSize) override
|
||||
{
|
||||
AZ_Assert(m_data != nullptr, "You must call SetData function, before you can read data!");
|
||||
AZ_Assert(data != nullptr && maxDataSize > 0, "We must have a valid pointer and max data size!");
|
||||
@@ -523,7 +523,7 @@ namespace AZ
|
||||
bool Open(const char* fileName, int mode, int platformFlags = 0);
|
||||
void Close();
|
||||
|
||||
virtual void WriteBinary(const void* data, unsigned int dataSize);
|
||||
void WriteBinary(const void* data, unsigned int dataSize) override;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -540,7 +540,7 @@ namespace AZ
|
||||
DrillerInputFileStream();
|
||||
~DrillerInputFileStream();
|
||||
bool Open(const char* fileName, int mode, int platformFlags = 0);
|
||||
virtual unsigned int ReadBinary(void* data, unsigned int maxDataSize);
|
||||
unsigned int ReadBinary(void* data, unsigned int maxDataSize) override;
|
||||
void Close();
|
||||
};
|
||||
|
||||
|
||||
@@ -98,21 +98,21 @@ namespace AZ
|
||||
|
||||
/// Return compressor type id.
|
||||
static AZ::u32 TypeId();
|
||||
virtual AZ::u32 GetTypeId() const { return TypeId(); }
|
||||
AZ::u32 GetTypeId() const override { return TypeId(); }
|
||||
/// Called when we open a stream to Read for the first time. Data contains the first. dataSize <= m_maxHeaderSize.
|
||||
virtual bool ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize);
|
||||
bool ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize) override;
|
||||
/// Called when we are about to start writing to a compressed stream.
|
||||
virtual bool WriteHeaderAndData(CompressorStream* stream);
|
||||
bool WriteHeaderAndData(CompressorStream* stream) override;
|
||||
/// Forwarded function from the Device when we from a compressed stream.
|
||||
virtual SizeType Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer);
|
||||
SizeType Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer) override;
|
||||
/// Forwarded function from the Device when we write to a compressed stream.
|
||||
virtual SizeType Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset = SizeType(-1));
|
||||
SizeType Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset = SizeType(-1)) override;
|
||||
/// Write a seek point.
|
||||
virtual bool WriteSeekPoint(CompressorStream* stream);
|
||||
bool WriteSeekPoint(CompressorStream* stream) override;
|
||||
/// Set auto seek point even dataSize bytes.
|
||||
virtual bool StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize);
|
||||
bool StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize) override;
|
||||
/// Called just before we close the stream. All compression data will be flushed and finalized. (You can't add data afterwards).
|
||||
virtual bool Close(CompressorStream* stream);
|
||||
bool Close(CompressorStream* stream) override;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace AZ
|
||||
{
|
||||
}
|
||||
protected:
|
||||
virtual void Process()
|
||||
void Process() override
|
||||
{
|
||||
m_notifyFlag->store(true, AZStd::memory_order_release);
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace AZ
|
||||
: public Sample<Vector3>
|
||||
{
|
||||
public:
|
||||
Vector3 GetInterpolatedValue(TimeType time) override final
|
||||
Vector3 GetInterpolatedValue(TimeType time) final
|
||||
{
|
||||
Vector3 interpolatedValue = m_previousValue;
|
||||
if (m_targetTimestamp != 0)
|
||||
@@ -108,7 +108,7 @@ namespace AZ
|
||||
: public Sample<Quaternion>
|
||||
{
|
||||
public:
|
||||
Quaternion GetInterpolatedValue(TimeType time) override final
|
||||
Quaternion GetInterpolatedValue(TimeType time) final
|
||||
{
|
||||
Quaternion interpolatedValue = m_previousValue;
|
||||
if (m_targetTimestamp != 0)
|
||||
@@ -144,7 +144,7 @@ namespace AZ
|
||||
: public Sample<Vector3>
|
||||
{
|
||||
public:
|
||||
Vector3 GetInterpolatedValue(TimeType /*time*/) override final
|
||||
Vector3 GetInterpolatedValue(TimeType /*time*/) final
|
||||
{
|
||||
return GetTargetValue();
|
||||
}
|
||||
@@ -155,7 +155,7 @@ namespace AZ
|
||||
: public Sample<Quaternion>
|
||||
{
|
||||
public:
|
||||
Quaternion GetInterpolatedValue(TimeType /*time*/) override final
|
||||
Quaternion GetInterpolatedValue(TimeType /*time*/) final
|
||||
{
|
||||
return GetTargetValue();
|
||||
}
|
||||
|
||||
@@ -48,17 +48,17 @@ namespace AZ
|
||||
HeapSchema(const Descriptor& desc);
|
||||
virtual ~HeapSchema();
|
||||
|
||||
virtual pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0);
|
||||
virtual void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0);
|
||||
virtual pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) { (void)ptr; (void)newSize; (void)newAlignment; return NULL; }
|
||||
virtual size_type Resize(pointer_type ptr, size_type newSize) { (void)ptr; (void)newSize; return 0; }
|
||||
virtual size_type AllocationSize(pointer_type ptr);
|
||||
pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override { (void)ptr; (void)newSize; (void)newAlignment; return NULL; }
|
||||
size_type Resize(pointer_type ptr, size_type newSize) override { (void)ptr; (void)newSize; return 0; }
|
||||
size_type AllocationSize(pointer_type ptr) override;
|
||||
|
||||
virtual size_type NumAllocatedBytes() const { return m_used; }
|
||||
virtual size_type Capacity() const { return m_capacity; }
|
||||
virtual size_type GetMaxAllocationSize() const;
|
||||
virtual IAllocatorAllocate* GetSubAllocator() { return m_subAllocator; }
|
||||
virtual void GarbageCollect() {}
|
||||
size_type NumAllocatedBytes() const override { return m_used; }
|
||||
size_type Capacity() const override { return m_capacity; }
|
||||
size_type GetMaxAllocationSize() const override;
|
||||
IAllocatorAllocate* GetSubAllocator() override { return m_subAllocator; }
|
||||
void GarbageCollect() override {}
|
||||
|
||||
private:
|
||||
AZ_FORCE_INLINE size_type ChunckSize(pointer_type ptr);
|
||||
|
||||
@@ -56,21 +56,21 @@ namespace AZ
|
||||
HphaSchema(const Descriptor& desc);
|
||||
virtual ~HphaSchema();
|
||||
|
||||
virtual pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0);
|
||||
virtual void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0);
|
||||
virtual pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment);
|
||||
pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override;
|
||||
/// Resizes allocated memory block to the size possible and returns that size.
|
||||
virtual size_type Resize(pointer_type ptr, size_type newSize);
|
||||
virtual size_type AllocationSize(pointer_type ptr);
|
||||
size_type Resize(pointer_type ptr, size_type newSize) override;
|
||||
size_type AllocationSize(pointer_type ptr) override;
|
||||
|
||||
virtual size_type NumAllocatedBytes() const;
|
||||
virtual size_type Capacity() const;
|
||||
virtual size_type GetMaxAllocationSize() const;
|
||||
virtual size_type GetUnAllocatedMemory(bool isPrint = false) const;
|
||||
virtual IAllocatorAllocate* GetSubAllocator() { return m_desc.m_subAllocator; }
|
||||
size_type NumAllocatedBytes() const override;
|
||||
size_type Capacity() const override;
|
||||
size_type GetMaxAllocationSize() const override;
|
||||
size_type GetUnAllocatedMemory(bool isPrint = false) const override;
|
||||
IAllocatorAllocate* GetSubAllocator() override { return m_desc.m_subAllocator; }
|
||||
|
||||
/// Return unused memory to the OS (if we don't use fixed block). Don't call this unless you really need free memory, it is slow.
|
||||
virtual void GarbageCollect();
|
||||
void GarbageCollect() override;
|
||||
|
||||
private:
|
||||
// [LY-84974][sconel@][2018-08-10] SliceStrike integration up to CL 671758
|
||||
|
||||
@@ -41,17 +41,17 @@ namespace AZ
|
||||
//---------------------------------------------------------------------
|
||||
// IAllocatorAllocate
|
||||
//---------------------------------------------------------------------
|
||||
virtual pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
virtual void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
virtual pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override;
|
||||
virtual size_type Resize(pointer_type ptr, size_type newSize) override;
|
||||
virtual size_type AllocationSize(pointer_type ptr) override;
|
||||
pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override;
|
||||
size_type Resize(pointer_type ptr, size_type newSize) override;
|
||||
size_type AllocationSize(pointer_type ptr) override;
|
||||
|
||||
virtual size_type NumAllocatedBytes() const override;
|
||||
virtual size_type Capacity() const override;
|
||||
virtual size_type GetMaxAllocationSize() const override;
|
||||
virtual IAllocatorAllocate* GetSubAllocator() override;
|
||||
virtual void GarbageCollect() override;
|
||||
size_type NumAllocatedBytes() const override;
|
||||
size_type Capacity() const override;
|
||||
size_type GetMaxAllocationSize() const override;
|
||||
IAllocatorAllocate* GetSubAllocator() override;
|
||||
void GarbageCollect() override;
|
||||
|
||||
private:
|
||||
typedef void* (*MallocFn)(size_t);
|
||||
|
||||
@@ -38,24 +38,24 @@ namespace AZ
|
||||
protected:
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Driller
|
||||
virtual const char* GroupName() const { return "SystemDrillers"; }
|
||||
virtual const char* GetName() const { return "MemoryDriller"; }
|
||||
virtual const char* GetDescription() const { return "Reports all allocators and memory allocations."; }
|
||||
virtual void Start(const Param* params = NULL, int numParams = 0);
|
||||
virtual void Stop();
|
||||
const char* GroupName() const override { return "SystemDrillers"; }
|
||||
const char* GetName() const override { return "MemoryDriller"; }
|
||||
const char* GetDescription() const override { return "Reports all allocators and memory allocations."; }
|
||||
void Start(const Param* params = NULL, int numParams = 0) override;
|
||||
void Stop() override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// MemoryDrillerBus
|
||||
virtual void RegisterAllocator(IAllocator* allocator);
|
||||
virtual void UnregisterAllocator(IAllocator* allocator);
|
||||
void RegisterAllocator(IAllocator* allocator) override;
|
||||
void UnregisterAllocator(IAllocator* allocator) override;
|
||||
|
||||
virtual void RegisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, unsigned int stackSuppressCount);
|
||||
virtual void UnregisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, AllocationInfo* info);
|
||||
virtual void ReallocateAllocation(IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment);
|
||||
virtual void ResizeAllocation(IAllocator* allocator, void* address, size_t newSize);
|
||||
void RegisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, unsigned int stackSuppressCount) override;
|
||||
void UnregisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, AllocationInfo* info) override;
|
||||
void ReallocateAllocation(IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment) override;
|
||||
void ResizeAllocation(IAllocator* allocator, void* address, size_t newSize) override;
|
||||
|
||||
virtual void DumpAllAllocations();
|
||||
void DumpAllAllocations() override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void RegisterAllocatorOutput(IAllocator* allocator);
|
||||
|
||||
@@ -77,17 +77,17 @@ namespace AZ
|
||||
//---------------------------------------------------------------------
|
||||
// IAllocatorAllocate
|
||||
//---------------------------------------------------------------------
|
||||
virtual pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
virtual void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
virtual pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override;
|
||||
virtual size_type Resize(pointer_type ptr, size_type newSize) override;
|
||||
virtual size_type AllocationSize(pointer_type ptr) override;
|
||||
pointer_type Allocate(size_type byteSize, size_type alignment, int flags, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override;
|
||||
void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override;
|
||||
pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override;
|
||||
size_type Resize(pointer_type ptr, size_type newSize) override;
|
||||
size_type AllocationSize(pointer_type ptr) override;
|
||||
|
||||
virtual size_type NumAllocatedBytes() const override;
|
||||
virtual size_type Capacity() const override;
|
||||
virtual size_type GetMaxAllocationSize() const override;
|
||||
virtual IAllocatorAllocate* GetSubAllocator() override;
|
||||
virtual void GarbageCollect() override;
|
||||
size_type NumAllocatedBytes() const override;
|
||||
size_type Capacity() const override;
|
||||
size_type GetMaxAllocationSize() const override;
|
||||
IAllocatorAllocate* GetSubAllocator() override;
|
||||
void GarbageCollect() override;
|
||||
|
||||
private:
|
||||
OverrunDetectionSchemaImpl* m_impl;
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace AZ
|
||||
* DO NOT OVERRIDE. This method will return in the future, but at this point things reflected here are not unreflected for all ReflectContexts (Serialize, Editor, Network, Script, etc.)
|
||||
* Place all calls to non-component reflect functions inside of a component reflect function to ensure that your types are unreflected.
|
||||
*/
|
||||
virtual void Reflect(AZ::ReflectContext*) final { }
|
||||
void Reflect(AZ::ReflectContext*) {}
|
||||
|
||||
/**
|
||||
* Override to require specific components on the system entity.
|
||||
|
||||
@@ -594,8 +594,8 @@ namespace AZ
|
||||
void SetArgumentName(size_t index, const AZStd::string& name) override;
|
||||
const AZStd::string* GetArgumentToolTip(size_t index) const override;
|
||||
void SetArgumentToolTip(size_t index, const AZStd::string& name) override;
|
||||
virtual void SetDefaultValue(size_t index, BehaviorDefaultValuePtr defaultValue) override;
|
||||
virtual BehaviorDefaultValuePtr GetDefaultValue(size_t index) const override;
|
||||
void SetDefaultValue(size_t index, BehaviorDefaultValuePtr defaultValue) override;
|
||||
BehaviorDefaultValuePtr GetDefaultValue(size_t index) const override;
|
||||
const BehaviorParameter* GetResult() const override;
|
||||
|
||||
void OverrideParameterTraits(size_t index, AZ::u32 addTraits, AZ::u32 removeTraits) override;
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||
*
|
||||
*/
|
||||
#ifndef AZCORE_RTTI_H
|
||||
#define AZCORE_RTTI_H
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AzCore/RTTI/TypeInfo.h>
|
||||
#include <AzCore/Module/Environment.h>
|
||||
@@ -44,21 +44,9 @@ namespace AZ
|
||||
/// RTTI typeId
|
||||
typedef void (* RTTI_EnumCallback)(const AZ::TypeId& /*typeId*/, void* /*userData*/);
|
||||
|
||||
// Disabling missing override warning because we intentionally want to allow for declaring RTTI base classes that don't impelment RTTI.
|
||||
#if defined(AZ_COMPILER_CLANG)
|
||||
# define AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
_Pragma("clang diagnostic push") \
|
||||
_Pragma("clang diagnostic ignored \"-Winconsistent-missing-override\"")
|
||||
# define AZ_POP_DISABLE_OVERRIDE_WARNING \
|
||||
_Pragma("clang diagnostic pop")
|
||||
#else
|
||||
# define AZ_PUSH_DISABLE_OVERRIDE_WARNING
|
||||
# define AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
#endif
|
||||
|
||||
// We require AZ_TYPE_INFO to be declared
|
||||
#define AZ_RTTI_COMMON() \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
void RTTI_Enable(); \
|
||||
virtual inline const AZ::TypeId& RTTI_GetType() const { return RTTI_Type(); } \
|
||||
virtual inline const char* RTTI_GetTypeName() const { return RTTI_TypeName(); } \
|
||||
@@ -66,7 +54,7 @@ namespace AZ
|
||||
virtual void RTTI_EnumTypes(AZ::RTTI_EnumCallback cb, void* userData) { RTTI_EnumHierarchy(cb, userData); } \
|
||||
static inline const AZ::TypeId& RTTI_Type() { return TYPEINFO_Uuid(); } \
|
||||
static inline const char* RTTI_TypeName() { return TYPEINFO_Name(); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
//#define AZ_RTTI_1(_1) static_assert(false,"You must provide a valid classUuid!")
|
||||
|
||||
@@ -74,8 +62,10 @@ namespace AZ
|
||||
#define AZ_RTTI_1() AZ_RTTI_COMMON() \
|
||||
static bool RTTI_IsContainType(const AZ::TypeId& id) { return id == RTTI_Type(); } \
|
||||
static void RTTI_EnumHierarchy(AZ::RTTI_EnumCallback cb, void* userData) { cb(RTTI_Type(), userData); } \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { return (id == RTTI_Type()) ? this : nullptr; } \
|
||||
virtual inline void* RTTI_AddressOf(const AZ::TypeId& id) { return (id == RTTI_Type()) ? this : nullptr; }
|
||||
virtual inline void* RTTI_AddressOf(const AZ::TypeId& id) { return (id == RTTI_Type()) ? this : nullptr; } \
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
/// AZ_RTTI(BaseClass)
|
||||
#define AZ_RTTI_2(_1) AZ_RTTI_COMMON() \
|
||||
@@ -85,14 +75,14 @@ namespace AZ
|
||||
static void RTTI_EnumHierarchy(AZ::RTTI_EnumCallback cb, void* userData) { \
|
||||
cb(RTTI_Type(), userData); \
|
||||
AZ::Internal::RttiCaller<_1>::RTTI_EnumHierarchy(cb, userData); } \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
return AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); } \
|
||||
virtual inline void* RTTI_AddressOf(const AZ::TypeId& id) { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
return AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
/// AZ_RTTI(BaseClass1,BaseClass2)
|
||||
#define AZ_RTTI_3(_1, _2) AZ_RTTI_COMMON() \
|
||||
@@ -104,7 +94,7 @@ namespace AZ
|
||||
cb(RTTI_Type(), userData); \
|
||||
AZ::Internal::RttiCaller<_1>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_2>::RTTI_EnumHierarchy(cb, userData); } \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
const void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
@@ -113,7 +103,7 @@ namespace AZ
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
return AZ::Internal::RttiCaller<_2>::RTTI_AddressOf(this, id); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
/// AZ_RTTI(BaseClass1,BaseClass2,BaseClass3)
|
||||
#define AZ_RTTI_4(_1, _2, _3) AZ_RTTI_COMMON() \
|
||||
@@ -127,7 +117,7 @@ namespace AZ
|
||||
AZ::Internal::RttiCaller<_1>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_2>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_3>::RTTI_EnumHierarchy(cb, userData); } \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
const void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
@@ -138,7 +128,7 @@ namespace AZ
|
||||
void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
r = AZ::Internal::RttiCaller<_2>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
return AZ::Internal::RttiCaller<_3>::RTTI_AddressOf(this, id); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
/// AZ_RTTI(BaseClass1,BaseClass2,BaseClass3,BaseClass4)
|
||||
#define AZ_RTTI_5(_1, _2, _3, _4) AZ_RTTI_COMMON() \
|
||||
@@ -154,7 +144,7 @@ namespace AZ
|
||||
AZ::Internal::RttiCaller<_2>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_3>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_4>::RTTI_EnumHierarchy(cb, userData); } \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
const void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
@@ -167,7 +157,7 @@ namespace AZ
|
||||
r = AZ::Internal::RttiCaller<_2>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
r = AZ::Internal::RttiCaller<_3>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
return AZ::Internal::RttiCaller<_4>::RTTI_AddressOf(this, id); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
/// AZ_RTTI(BaseClass1,BaseClass2,BaseClass3,BaseClass4,BaseClass5)
|
||||
#define AZ_RTTI_6(_1, _2, _3, _4, _5) AZ_RTTI_COMMON() \
|
||||
@@ -185,7 +175,7 @@ namespace AZ
|
||||
AZ::Internal::RttiCaller<_3>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_4>::RTTI_EnumHierarchy(cb, userData); \
|
||||
AZ::Internal::RttiCaller<_5>::RTTI_EnumHierarchy(cb, userData); } \
|
||||
AZ_PUSH_DISABLE_OVERRIDE_WARNING \
|
||||
AZ_PUSH_DISABLE_WARNING(26433, "-Winconsistent-missing-override") \
|
||||
virtual inline const void* RTTI_AddressOf(const AZ::TypeId& id) const { \
|
||||
if (id == RTTI_Type()) { return this; } \
|
||||
const void* r = AZ::Internal::RttiCaller<_1>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
@@ -200,7 +190,7 @@ namespace AZ
|
||||
r = AZ::Internal::RttiCaller<_3>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
r = AZ::Internal::RttiCaller<_4>::RTTI_AddressOf(this, id); if (r) { return r; } \
|
||||
return AZ::Internal::RttiCaller<_5>::RTTI_AddressOf(this, id); } \
|
||||
AZ_POP_DISABLE_OVERRIDE_WARNING
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// MACRO specialization to allow optional parameters for template version of AZ_RTTI
|
||||
@@ -1077,7 +1067,6 @@ namespace AZ
|
||||
{
|
||||
return AZ::Internal::RttiIsTypeOfIdHelper<U>::Check(id, data, typename HasAZRtti<AZStd::remove_pointer_t<U>>::kind_type());
|
||||
}
|
||||
|
||||
} // namespace AZ
|
||||
|
||||
#endif // AZCORE_RTTI_H
|
||||
#pragma once
|
||||
|
||||
@@ -19,8 +19,8 @@ namespace AZ
|
||||
public:
|
||||
AZ_COMPONENT(JsonSystemComponent, "{3C2C7234-9512-4E24-86F0-C40865D7EECE}", Component);
|
||||
|
||||
void Activate();
|
||||
void Deactivate();
|
||||
void Activate() override;
|
||||
void Deactivate() override;
|
||||
|
||||
static void Reflect(ReflectContext* reflectContext);
|
||||
};
|
||||
|
||||
@@ -116,9 +116,9 @@ namespace AZ
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// UserSettingsBus
|
||||
virtual AZStd::intrusive_ptr<UserSettings> FindUserSettings(u32 id);
|
||||
virtual void AddUserSettings(u32 id, UserSettings* settings);
|
||||
virtual bool Save(const char* settingsPath, SerializeContext* sc);
|
||||
AZStd::intrusive_ptr<UserSettings> FindUserSettings(u32 id) override;
|
||||
void AddUserSettings(u32 id, UserSettings* settings) override;
|
||||
bool Save(const char* settingsPath, SerializeContext* sc) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
static void Reflect(ReflectContext* reflection);
|
||||
|
||||
@@ -187,7 +187,7 @@ namespace AZStd
|
||||
: m_f(AZStd::move(f)) {}
|
||||
thread_info_impl(Internal::thread_move_t<F> f)
|
||||
: m_f(f) {}
|
||||
virtual void execute() { m_f(); }
|
||||
void execute() override { m_f(); }
|
||||
private:
|
||||
F m_f;
|
||||
|
||||
|
||||
@@ -129,16 +129,16 @@ namespace AZStd
|
||||
{
|
||||
}
|
||||
|
||||
virtual void dispose() // nothrow
|
||||
void dispose() override // nothrow
|
||||
{
|
||||
AZStd::checked_delete(px_);
|
||||
}
|
||||
virtual void destroy() // nothrow
|
||||
void destroy() override // nothrow
|
||||
{
|
||||
this->~this_type();
|
||||
a_.deallocate(this, sizeof(this_type), AZStd::alignment_of<this_type>::value);
|
||||
}
|
||||
virtual void* get_deleter(Internal::sp_typeinfo const&)
|
||||
void* get_deleter(Internal::sp_typeinfo const&) override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -176,18 +176,18 @@ namespace AZStd
|
||||
{
|
||||
}
|
||||
|
||||
virtual void dispose() // nothrow
|
||||
void dispose() override // nothrow
|
||||
{
|
||||
d_(p_);
|
||||
}
|
||||
|
||||
virtual void destroy() // nothrow
|
||||
void destroy() override // nothrow
|
||||
{
|
||||
this->~this_type();
|
||||
a_.deallocate(this, sizeof(this_type), AZStd::alignment_of<this_type>::value);
|
||||
}
|
||||
|
||||
virtual void* get_deleter(Internal::sp_typeinfo const& ti)
|
||||
void* get_deleter(Internal::sp_typeinfo const& ti) override
|
||||
{
|
||||
return ti == aztypeid(D) ? &reinterpret_cast<char&>(d_) : 0;
|
||||
}
|
||||
|
||||
+5
-5
@@ -21,7 +21,7 @@ namespace AZ
|
||||
class WinAPIOverrunDetectionSchema : public OverrunDetectionSchema::PlatformAllocator
|
||||
{
|
||||
public:
|
||||
virtual SystemInformation GetSystemInformation() override
|
||||
SystemInformation GetSystemInformation() override
|
||||
{
|
||||
SystemInformation result;
|
||||
SYSTEM_INFO info;
|
||||
@@ -32,7 +32,7 @@ namespace AZ
|
||||
return result;
|
||||
}
|
||||
|
||||
virtual void* ReserveBytes(size_t amount) override
|
||||
void* ReserveBytes(size_t amount) override
|
||||
{
|
||||
void* result = VirtualAlloc(0, amount, MEM_RESERVE, PAGE_NOACCESS);
|
||||
|
||||
@@ -45,12 +45,12 @@ namespace AZ
|
||||
return result;
|
||||
}
|
||||
|
||||
virtual void ReleaseReservedBytes(void* base) override
|
||||
void ReleaseReservedBytes(void* base) override
|
||||
{
|
||||
VirtualFree(base, 0, MEM_RELEASE);
|
||||
}
|
||||
|
||||
virtual void* CommitBytes(void* base, size_t amount) override
|
||||
void* CommitBytes(void* base, size_t amount) override
|
||||
{
|
||||
void* result = VirtualAlloc(base, amount, MEM_COMMIT, PAGE_READWRITE);
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace AZ
|
||||
return result;
|
||||
}
|
||||
|
||||
virtual void DecommitBytes(void* base, size_t amount) override
|
||||
void DecommitBytes(void* base, size_t amount) override
|
||||
{
|
||||
VirtualFree(base, amount, MEM_DECOMMIT);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user