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

Fix several build failures

Browse Source
This commit is contained in:
karlberg
2021-05-07 09:54:49 -07:00
parent c21b4a577d
commit 05a39a4412
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
+2 -2
View File
@@ -206,8 +206,8 @@ namespace AZ
void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler& handler) override final;
void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler& handler) override final;
void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler& handler) override final;
void SignalEntityActivated(AZ::Entity* entity) override final;
void SignalEntityDeactivated(AZ::Entity* entity) override final;
void SignalEntityActivated(Entity* entity) override final;
void SignalEntityDeactivated(Entity* entity) override final;
bool AddEntity(Entity* entity) override;
bool RemoveEntity(Entity* entity) override;
bool DeleteEntity(const EntityId& id) override;
Code/Framework/AzCore/Tests/BehaviorContextFixture.h
+4 -4
View File
@@ -52,10 +52,10 @@ namespace UnitTest
void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override {}
void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override {}
void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override {}
void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override {}
void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override {}
void SignalEntityActivated(AZ::Entity* entity) override {}
void SignalEntityDeactivated(AZ::Entity* entity) override {}
void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override {}
void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override {}
void SignalEntityActivated(AZ::Entity*) override {}
void SignalEntityDeactivated(AZ::Entity*) override {}
bool AddEntity(AZ::Entity*) override { return true; }
bool RemoveEntity(AZ::Entity*) override { return true; }
bool DeleteEntity(const AZ::EntityId&) override { return true; }
Code/Framework/AzCore/Tests/Serialization.cpp
+2 -2
View File
@@ -1234,8 +1234,8 @@ namespace UnitTest
void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override { }
void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
void SignalEntityActivated(AZ::Entity* entity) override { }
void SignalEntityDeactivated(AZ::Entity* entity) override { }
void SignalEntityActivated(Entity*) override { }
void SignalEntityDeactivated(Entity*) override { }
bool AddEntity(Entity*) override { return false; }
bool RemoveEntity(Entity*) override { return false; }
bool DeleteEntity(const EntityId&) override { return false; }