Page MenuHomeWildfire Games
Differential D5137

Replaces virtual by override for CModelAbstract and derived classes
ClosedPublic
Actions

Authored by vladislavbelov on Sep 21 2023, 9:12 PM.

Details

Reviewers
None
Commits
rP27854: Replaces virtual by override for CModelAbstract and derived classes.
Summary

To make the refactoring safer during method shuffling.

Test Plan
  1. Apply the patch and compile the game
  2. Run tests

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vladislavbelov created this revision.Sep 21 2023, 9:12 PM
Vulcan added a comment.Sep 21 2023, 9:13 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7318/display/redirect

Vulcan added a comment.Sep 21 2023, 9:26 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8407/display/redirect

Vulcan added a comment.Sep 21 2023, 9:59 PM

Successful build - Chance fights ever on the side of the prudent.

builderr-debug-clang8.txt
In file included from ../../../source/simulation2/components/CCmpProjectileManager.cpp:31:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/simulation2/components/CCmpVisualActor.cpp:40:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/GameView.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/Model.cpp:20:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/ObjectEntry.cpp:26:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/SkeletonAnimManager.cpp:27:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/Unit.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/UnitAnimation.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/UnitManager.cpp:20:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/DecalRData.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/HWLightingModelRenderer.cpp:24:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/InstancingModelRenderer.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/ModelRenderer.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/RenderModifiers.cpp:25:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/Scene.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/SceneRenderer.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/SilhouetteRenderer.cpp:24:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/TerrainRenderer.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/tools/atlas/GameInterface/ActorViewer.cpp:28:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/tests/test_Model.cpp:16:
In file included from /zpool0/clang8/source/graphics/tests/test_Model.h:21:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
builderr-release-clang8.txt
In file included from ../../../source/simulation2/components/CCmpProjectileManager.cpp:31:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/simulation2/components/CCmpVisualActor.cpp:40:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/GameView.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/Model.cpp:20:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/ObjectEntry.cpp:26:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/SkeletonAnimManager.cpp:27:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/Unit.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/UnitAnimation.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/UnitManager.cpp:20:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/DecalRData.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/HWLightingModelRenderer.cpp:24:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/InstancingModelRenderer.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/ModelRenderer.cpp:23:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/RenderModifiers.cpp:25:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/Scene.cpp:22:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/SceneRenderer.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/SilhouetteRenderer.cpp:24:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/renderer/TerrainRenderer.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/tools/atlas/GameInterface/ActorViewer.cpp:28:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp:29:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.
In file included from ../../../source/graphics/tests/test_Model.cpp:16:
In file included from /zpool0/clang8/source/graphics/tests/test_Model.h:21:
../../../source/graphics/Model.h:91:7: warning: 'SetPlayerID' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        void SetPlayerID(player_id_t id);
             ^
../../../source/graphics/ModelAbstract.h:156:15: note: overridden virtual function is here
        virtual void SetPlayerID(player_id_t id) { m_PlayerID = id; }
                     ^
1 warning generated.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/8989/display/redirect

Harbormaster completed remote builds in B22372: Diff 22297.Sep 21 2023, 9:59 PM
vladislavbelov requested review of this revision.Sep 21 2023, 9:59 PM
vladislavbelov updated this revision to Diff 22303.Sep 22 2023, 11:49 AM
Vulcan added a comment.Sep 22 2023, 11:50 AM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7319/display/redirect

Vulcan added a comment.Sep 22 2023, 12:05 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8408/display/redirect

Harbormaster completed remote builds in B22378: Diff 22303.Sep 22 2023, 12:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.Sep 23 2023, 9:55 PM
This revision was landed with ongoing or failed builds.
Closed by commit rP27854: Replaces virtual by override for CModelAbstract and derived classes. (authored by vladislavbelov). · Explain Why
This revision was automatically updated to reflect the committed changes.
vladislavbelov added a commit: rP27854: Replaces virtual by override for CModelAbstract and derived classes..

Revision Contents
Changeset List

PathSize
ps/
trunk/
source/
graphics/
14 lines
29 lines
5 lines
14 lines
18 lines

Diff 22305

View Options

ps/trunk/source/graphics/Decal.h

Loading...
View Options

ps/trunk/source/graphics/Model.h

Loading...
View Options

ps/trunk/source/graphics/ModelAbstract.h

Loading...
View Options

ps/trunk/source/graphics/ModelDummy.h

Loading...
View Options

ps/trunk/source/graphics/ParticleEmitter.h

Loading...
Wildfire Games · Phabricator