Diffusion 0 A.D. Public Repository rP26369

Removes unused and redundant h_mgr after rP25936 and rP26368.
AuditedrP26369
Actions

Tags

None

Subscribers

Description

Removes unused and redundant h_mgr after rP25936 and rP26368.

Details

Auditors

Committed

Feb 13 2022, 11:31 PM

Parents

rP26368: Removes unused ogl_tex after rP26365 and rP26367.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 19475
Build 46579: Trigger Windows Autobuild
Build 46578: Post-Commit Build	Jenkins
Build 46577: Post-Commit Build (macOS)	Jenkins

Event Timeline

vladislavbelov committed rP26369: Removes unused and redundant h_mgr after rP25936 and rP26368..Feb 13 2022, 11:31 PM

Harbormaster failed to build B19475: rP26369: Removes unused and redundant h_mgr after rP25936 and rP26368.!Feb 13 2022, 11:34 PM

Font.cpp
In file included from ../../../source/graphics/Font.cpp:19:
../../../source/graphics/Font.h:22:10: fatal error: lib/res/handle.h: No such file or directory
   22 | #include "lib/res/handle.h"
      |          ^~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [graphics.make:249: obj/graphics_Release/Font.o] Error 1
make: *** [Makefile:127: graphics] Error 2

(Also see the CI.)

This commit now has outstanding concerns.Feb 14 2022, 6:47 AM

vladislavbelov mentioned this in rP26372: Fixes builds after rP26369 by removing includes to res handle..Feb 14 2022, 7:30 AM

In rP26369#55926, @Freagarach wrote:

Font.cpp
In file included from ../../../source/graphics/Font.cpp:19:
../../../source/graphics/Font.h:22:10: fatal error: lib/res/handle.h: No such file or directory
   22 | #include "lib/res/handle.h"
      |          ^~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [graphics.make:249: obj/graphics_Release/Font.o] Error 1
make: *** [Makefile:127: graphics] Error 2

(Also see the CI.)

Fixed in rP26372.

This commit now requires verification by auditors.Feb 14 2022, 7:31 AM

Compiles successfully for me now.

All concerns with this commit have now been addressed.Feb 14 2022, 8:05 AM

Changes (12)

Path

Size

ps/

trunk/

source/

graphics/

TerrainTextureManager.h

tests/

test_TextureManager.h

lib/

tex/

ps/

GameSetup/

rP26369

ps/trunk/source/graphics/MapReader.h

Loading...

ps/trunk/source/graphics/MiniPatch.h

Loading...

ps/trunk/source/graphics/TerrainTextureManager.h

Loading...

ps/trunk/source/graphics/tests/test_TextureManager.h

Loading...

ps/trunk/source/lib/res/

Loading...

ps/trunk/source/lib/res/h_mgr.cpp

Loading...

ps/trunk/source/lib/res/h_mgr.h

Loading...

ps/trunk/source/lib/res/handle.h

Loading...

ps/trunk/source/lib/tex/tex.h

Loading...

ps/trunk/source/ps/Filesystem.cpp

Loading...

ps/trunk/source/ps/GameSetup/GameSetup.cpp

Loading...

ps/trunk/source/ps/Replay.cpp

Loading...