birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more Code/Framework fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-07 18:37:45 -07:00
parent 9e0ff8e55d
commit cc00a535d7
11 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Component/Component.h
+1 -1
View File
@@ -266,7 +266,7 @@ namespace AZ
_ComponentClass::RTTI_Type().ToString<AZStd::string>().c_str(), descriptor->GetName(), _ComponentClass::RTTI_TypeName()); \
return nullptr; \
} \
else if (descriptor->GetName() != _ComponentClass::RTTI_TypeName()) \
if (descriptor->GetName() != _ComponentClass::RTTI_TypeName()) \
{ \
AZ_Error("Component", false, "The same component UUID (%s) / name (%s) was registered twice. This isn't allowed, " \
"it can cause lifetime management issues / crashes.\nThis situation can happen by declaring a component " \
Code/Framework/AzCore/AzCore/RTTI/RTTI.h
+1 -4
View File
@@ -941,10 +941,7 @@ namespace AZ
{
return AZStd::shared_ptr<DestType>(ptr, castPtr);
}
else
{
return AZStd::shared_ptr<DestType>();
}
return AZStd::shared_ptr<DestType>();
}
// RttiCast specialization for intrusive_ptr.
Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.h
+1 -1
View File
@@ -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;
Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.h
+10 -10
View File
@@ -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
Code/Framework/AzFramework/AzFramework/Asset/GenericAssetHandler.h
+2 -2
View File
@@ -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);
Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.h
+1 -1
View File
@@ -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 ...
Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
+1 -1
View File
@@ -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;
//////////////////////////////////////////////////////////////////////////
Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.h
+3 -3
View File
@@ -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;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.h
+2 -2
View File
@@ -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;
Code/Framework/AzTest/AzTest/AzTest.h
+4 -4
View File
@@ -44,12 +44,12 @@ namespace AZ
virtual ~ITestEnvironment()
{}
void SetUp() override final
void SetUp() final
{
SetupEnvironment();
}
void TearDown() override final
void TearDown() final
{
TeardownEnvironment();
}
@@ -218,7 +218,7 @@ namespace AZ
public:
std::list<std::string> resultList;
void OnTestEnd(const ::testing::TestInfo& test_info)
void OnTestEnd(const ::testing::TestInfo& test_info) override
{
std::string result;
if (test_info.result()->Failed())
@@ -233,7 +233,7 @@ namespace AZ
resultList.emplace_back(formattedResult);
}
void OnTestProgramEnd(const ::testing::UnitTest& unit_test)
void OnTestProgramEnd(const ::testing::UnitTest& unit_test) override
{
for (std::string testResults : resultList)
{
Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.h
+1 -1
View File
@@ -133,7 +133,7 @@ namespace GridMate
typedef AZStd::intrusive_ptr<BitmaskInterestChunk> Ptr;
bool IsReplicaMigratable() override { return false; }
bool IsBroadcast() { return true; }
bool IsBroadcast() override { return true; }
static const char* GetChunkName() { return "BitmaskInterestChunk"; }
void OnReplicaActivate(const ReplicaContext& rc) override;