Enables override/virtual warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -65,7 +65,7 @@ namespace AZ::IO
|
||||
void SetAlias(const char* alias, const char* path) override;
|
||||
void ClearAlias(const char* alias) override;
|
||||
AZStd::optional<AZ::u64> ConvertToAlias(char* inOutBuffer, AZ::u64 bufferLength) const override;
|
||||
bool ConvertToAlias(AZ::IO::FixedMaxPath& convertedPath, const AZ::IO::PathView& path) const;
|
||||
bool ConvertToAlias(AZ::IO::FixedMaxPath& convertedPath, const AZ::IO::PathView& path) const override;
|
||||
using FileIOBase::ConvertToAlias;
|
||||
const char* GetAlias(const char* alias) const override;
|
||||
bool ResolvePath(const char* path, char* resolvedPath, AZ::u64 resolvedPathSize) const override;
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace AZ::IO
|
||||
NestedArchive(IArchive* pArchive, AZStd::string_view strBindRoot, ZipDir::CachePtr pCache, uint32_t nFlags = 0);
|
||||
~NestedArchive() override;
|
||||
|
||||
auto GetRootFolderHandle() -> Handle;
|
||||
auto GetRootFolderHandle() -> Handle override;
|
||||
|
||||
// Adds a new file to the zip or update an existing one
|
||||
// adds a directory (creates several nested directories if needed)
|
||||
@@ -66,26 +66,26 @@ namespace AZ::IO
|
||||
int RemoveDir(AZStd::string_view szRelativePath) override;
|
||||
|
||||
// deletes all files from the archive
|
||||
int RemoveAll();
|
||||
int RemoveAll() override;
|
||||
|
||||
// finds the file; you don't have to close the returned handle
|
||||
Handle FindFile(AZStd::string_view szRelativePath);
|
||||
Handle FindFile(AZStd::string_view szRelativePath) override;
|
||||
|
||||
// returns the size of the file (unpacked) by the handle
|
||||
uint64_t GetFileSize(Handle fileHandle);
|
||||
uint64_t GetFileSize(Handle fileHandle) override;
|
||||
|
||||
// reads the file into the preallocated buffer (must be at least the size of GetFileSize())
|
||||
int ReadFile(Handle fileHandle, void* pBuffer);
|
||||
int ReadFile(Handle fileHandle, void* pBuffer) override;
|
||||
|
||||
// returns the full path to the archive file
|
||||
const char* GetFullPath() const;
|
||||
const char* GetFullPath() const override;
|
||||
ZipDir::Cache* GetCache();
|
||||
|
||||
uint32_t GetFlags() const;
|
||||
bool SetFlags(uint32_t nFlagsToSet);
|
||||
bool ResetFlags(uint32_t nFlagsToReset);
|
||||
uint32_t GetFlags() const override;
|
||||
bool SetFlags(uint32_t nFlagsToSet) override;
|
||||
bool ResetFlags(uint32_t nFlagsToReset) override;
|
||||
|
||||
bool SetPackAccessible(bool bAccessible);
|
||||
bool SetPackAccessible(bool bAccessible) override;
|
||||
|
||||
protected:
|
||||
// returns the pointer to the relative file path to be passed
|
||||
|
||||
@@ -866,7 +866,7 @@ namespace AzFramework
|
||||
|
||||
FileIsReadOnlyResponse() = default;
|
||||
FileIsReadOnlyResponse(bool isReadOnly);
|
||||
unsigned int GetMessageType() const;
|
||||
unsigned int GetMessageType() const override;
|
||||
|
||||
bool m_isReadOnly;
|
||||
};
|
||||
@@ -945,7 +945,7 @@ namespace AzFramework
|
||||
|
||||
FileModTimeRequest() = default;
|
||||
FileModTimeRequest(const AZ::OSString& filePath);
|
||||
unsigned int GetMessageType() const;
|
||||
unsigned int GetMessageType() const override;
|
||||
|
||||
AZ::OSString m_filePath;
|
||||
};
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace AzFramework
|
||||
{
|
||||
public:
|
||||
AZ_RTTI(GenericAssetHandlerBase, "{B153B8B5-25CC-4BB7-A2BD-9A47ECF4123C}", AZ::Data::AssetHandler);
|
||||
virtual ~GenericAssetHandlerBase() {}
|
||||
virtual ~GenericAssetHandlerBase() = default;
|
||||
};
|
||||
|
||||
template <typename AssetType>
|
||||
@@ -186,7 +186,7 @@ namespace AzFramework
|
||||
}
|
||||
}
|
||||
|
||||
bool CanHandleAsset(const AZ::Data::AssetId& id) const
|
||||
bool CanHandleAsset(const AZ::Data::AssetId& id) const override
|
||||
{
|
||||
AZStd::string assetPath;
|
||||
EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, id);
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace AzFramework
|
||||
// AZ::NonUniformScaleRequests::Handler ...
|
||||
AZ::Vector3 GetScale() const override;
|
||||
void SetScale(const AZ::Vector3& scale) override;
|
||||
void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler);
|
||||
void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler) override;
|
||||
|
||||
protected:
|
||||
// AZ::Component ...
|
||||
|
||||
@@ -105,7 +105,7 @@ namespace AzFramework
|
||||
virtual AZ::Matrix3x4 PopPremultipliedMatrix() { return AZ::Matrix3x4::CreateIdentity(); }
|
||||
|
||||
protected:
|
||||
~DebugDisplayRequests() = default;
|
||||
virtual ~DebugDisplayRequests() = default;
|
||||
};
|
||||
|
||||
/// Inherit from DebugDisplayRequestBus::Handler to implement the DebugDisplayRequests interface.
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace AzFramework
|
||||
// EntityContext
|
||||
AZ::Entity* CreateEntity(const char* name) override;
|
||||
void OnRootEntityReloaded() override;
|
||||
void OnContextEntitiesAdded(const EntityList& entities);
|
||||
void OnContextEntitiesAdded(const EntityList& entities) override;
|
||||
void OnContextReset() override;
|
||||
bool ValidateEntitiesAreValidForContext(const EntityList& entities) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -34,6 +34,7 @@ namespace AzFramework
|
||||
{
|
||||
}
|
||||
|
||||
using AZ::SettingsRegistryInterface::Visitor::Visit;
|
||||
void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type,
|
||||
AZStd::string_view value) override
|
||||
{
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace AzFramework
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// AZ::Component
|
||||
virtual void Init();
|
||||
virtual void Activate();
|
||||
virtual void Deactivate();
|
||||
void Init() override;
|
||||
void Activate() override;
|
||||
void Deactivate() override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -195,7 +195,7 @@ namespace AzFramework
|
||||
TmMsgCallback(const MsgCB& cb = NULL)
|
||||
: m_cb(cb) {}
|
||||
|
||||
virtual void OnReceivedMsg(TmMsgPtr msg)
|
||||
void OnReceivedMsg(TmMsgPtr msg) override
|
||||
{
|
||||
if (m_cb)
|
||||
{
|
||||
|
||||
@@ -19,6 +19,8 @@ namespace UnitTest
|
||||
{
|
||||
public:
|
||||
TestDebugDisplayRequests();
|
||||
~TestDebugDisplayRequests() override = default;
|
||||
|
||||
const AZStd::vector<AZ::Vector3>& GetPoints() const;
|
||||
void ClearPoints();
|
||||
//! Returns the AABB of the points generated from received draw calls.
|
||||
@@ -27,7 +29,9 @@ namespace UnitTest
|
||||
// DebugDisplayRequests ...
|
||||
void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
|
||||
void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
|
||||
using AzFramework::DebugDisplayRequests::DrawWireQuad;
|
||||
void DrawWireQuad(float width, float height) override;
|
||||
using AzFramework::DebugDisplayRequests::DrawQuad;
|
||||
void DrawQuad(float width, float height) override;
|
||||
void DrawTriangles(const AZStd::vector<AZ::Vector3>& vertices, const AZ::Color& color) override;
|
||||
void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) override;
|
||||
|
||||
@@ -45,10 +45,10 @@ namespace AzFramework
|
||||
//! All current and added controllers will be registered with this viewport.
|
||||
void RegisterViewportContext(ViewportId viewport) override;
|
||||
//! Unregisters a Viewport from this list and all associated controllers.
|
||||
void UnregisterViewportContext(ViewportId viewport);
|
||||
void UnregisterViewportContext(ViewportId viewport) override;
|
||||
//! All ViewportControllerLists have a priority of Custom to ensure
|
||||
//! that they receive events at all priorities from any parent controllers.
|
||||
AzFramework::ViewportControllerPriority GetPriority() const { return ViewportControllerPriority::DispatchToAllPriorities; }
|
||||
AzFramework::ViewportControllerPriority GetPriority() const override { return ViewportControllerPriority::DispatchToAllPriorities; }
|
||||
//! Returns true if this controller list is enabled, i.e.
|
||||
//! it is accepting and forwarding input and update events to its children.
|
||||
bool IsEnabled() const;
|
||||
|
||||
@@ -20,8 +20,7 @@ namespace Benchmark
|
||||
class BM_Octree
|
||||
: public benchmark::Fixture
|
||||
{
|
||||
public:
|
||||
void SetUp([[maybe_unused]] const ::benchmark::State& state) override
|
||||
void internalSetUp()
|
||||
{
|
||||
// Create the SystemAllocator if not available
|
||||
if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
|
||||
@@ -72,7 +71,7 @@ namespace Benchmark
|
||||
});
|
||||
}
|
||||
|
||||
void TearDown([[maybe_unused]] const ::benchmark::State& state) override
|
||||
void internalTearDown()
|
||||
{
|
||||
m_octreeSystemComponent->DestroyVisibilityScene(m_visScene);
|
||||
delete m_octreeSystemComponent;
|
||||
@@ -91,6 +90,25 @@ namespace Benchmark
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
void SetUp(const benchmark::State&) override
|
||||
{
|
||||
internalSetUp();
|
||||
}
|
||||
void SetUp(benchmark::State&) override
|
||||
{
|
||||
internalSetUp();
|
||||
}
|
||||
|
||||
void TearDown(const benchmark::State&) override
|
||||
{
|
||||
internalTearDown();
|
||||
}
|
||||
void TearDown(benchmark::State&) override
|
||||
{
|
||||
internalTearDown();
|
||||
}
|
||||
|
||||
void InsertEntries(uint32_t entryCount)
|
||||
{
|
||||
for (uint32_t i = 0; i < entryCount; ++i)
|
||||
|
||||
Reference in New Issue
Block a user