Skip to content

Updates for Svc/CmdDispatcher corresponding to UT cmake update for protected/private#3795

Merged
LeStarch merged 1 commit intonasa:develfrom
m-aleem:devel-3446-ae
Jun 25, 2025
Merged

Updates for Svc/CmdDispatcher corresponding to UT cmake update for protected/private#3795
LeStarch merged 1 commit intonasa:develfrom
m-aleem:devel-3446-ae

Conversation

@m-aleem
Copy link
Contributor

@m-aleem m-aleem commented Jun 24, 2025

Related Issue(s) #3446
Has Unit Tests (y/n) Yes - Existing
Documentation Included (y/n) N/A

Change Description

I locally updated fprime/cmake/settings.cmake to change -DPROTECTED=protected -DPRIVATE=private. This causes additional build errors beyond all our updates in manual code for PRIVATE->private and PROTECTED->protected due to auto-coded files which use PRIVATE, PROTECTED. This set of changes is associated with fixing Svc/CmdDispatcher so that the UTs in this directory can build and pass.

Approach in this case was:

  1. mv CmdDispatcherTester.cpp CmdDispatcherTestMain.cpp
  2. mv CmdDispatcherImplTester.hpp CmdDispatcherTester.hpp
  3. mv CmdDispatcherImplTester.cpp CmdDispatcherTester.cpp
  4. Change CmdDispatcherImplTester to CmdDispatcherTester where applicable in files content of the files above
  5. Change friend of CmdDispatcher from CmdDispatcherImplTester in CmdDispatcher.hpp to CmdDispatcherTester

Rationale

#3446

Future Work

  1. Note that this PR does not include the update to fprime/cmake/settings.cmake itself - this will be done at the end
  2. Note that this PR does not include re-naming the flight code Impl to (separate issue)

public:
CommandDispatcherImplTester(Svc::CommandDispatcherImpl& inst);
virtual ~CommandDispatcherImplTester();
CommandDispatcherTester(Svc::CommandDispatcherImpl& inst);

Check warning

Code scanning / CppCheck

Single-parameter constructors should be marked explicit. Warning test

Single-parameter constructors should be marked explicit.
@m-aleem m-aleem marked this pull request as ready for review June 24, 2025 21:13
@LeStarch LeStarch merged commit 3e7067d into nasa:devel Jun 25, 2025
51 checks passed
@m-aleem m-aleem deleted the devel-3446-ae branch June 25, 2025 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants