Remove forward-declaration stub-header directories (.forward-declarations/, forward-declarations/)
Deletes the two stub-header trees (249 files) that shadowed the real
rtiddsgen-generated DDS headers, and removes every reference to them.
CMake (15 include-path entries):
root CMakeLists.txt include_directories(.../forward-declarations);
NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists
(ServiceManagement, SoundManagement, SituationMap, ScreenRecording,
SituationReplayManagement, SituationReplay, ServiceMonitor)
Source includes that resolved to the root-level stubs (only 2, repointed to the
module-prefixed generated headers the rest of the tree already uses):
Lts/Services/AreaEffectSimulation/object_charge_effect.h
<aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h>
Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h
<taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h>
(generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h"
resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory)
Tests:
tests/test_migration_stubs.cpp: remove the redundant root-level stub test
(AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test
already exercises the same AreaEffectSimulation::Interface header.
tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered
out of the build) and remove its now-obsolete CMake list(FILTER) exclusion.
Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile
errors vs the pre-existing base-state baseline (77 unique real-error signatures
identical to baseline; all 15 'No such file' headers pre-existing).
This commit is contained in:
1 parent
8345470273
commit
040bdd558f
262 files changed
+2
-9887
No files matched your search
@@ -65,11 +65,6 @@ if(BUILD_TESTING)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor_editor\\.cpp")
|
||||
# Exclude Qt Test-based tests (conflict with gtest main())
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor\\.cpp")
|
||||
# Exclude test_skl_dtc: "Skeleton" is a placeholder service (no source
|
||||
# dir, no svcSklCommon target, no codegen output). Its stub header was
|
||||
# converted to a build-dir wrapper (commit 5501d1e5) that includes a
|
||||
# non-existent generated file, so the compilation test cannot resolve.
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_skl_dtc\\.cpp")
|
||||
|
||||
# Exclude Grantlee-related tests when BUILD_GRANTLEE is OFF
|
||||
if(NOT BUILD_GRANTLEE)
|
||||
|
||||
@@ -216,12 +216,3 @@ TEST(MigrationStubs, GenericDtcCompiles)
|
||||
// Verify GenericDtc template is accessible
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
// AES DTC (root level) - uses AreaEffectSimulation::Interface namespace
|
||||
#include "aes_dtc.h"
|
||||
|
||||
TEST(MigrationStubs, AesDtcCompiles)
|
||||
{
|
||||
using namespace AreaEffectSimulation::Interface;
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
/**
|
||||
* @file test_skl_dtc.cpp
|
||||
* @brief Compilation test for the Skeleton forward-declaration stub
|
||||
*
|
||||
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
|
||||
* Skeleton has no build target in the merged tree (module removed), so the
|
||||
* header is the forward-declaration stub in the allowed stub directory
|
||||
* (relocated from include/ by the merge; content unchanged).
|
||||
*/
|
||||
|
||||
#include "../.forward-declarations/include/Skeleton/skl_dtc.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
TEST(skl_dtc_Compilation, HeaderCompiles)
|
||||
{
|
||||
// This test verifies that the header compiles without errors
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
Reference in new issue
Block a user