Skip to content

Updates for Svc/ActiveLogger corresponding to UT cmake update for protected/private#3773

Merged
LeStarch merged 3 commits intonasa:develfrom
m-aleem:devel-3446-ab
Jun 25, 2025
Merged

Updates for Svc/ActiveLogger corresponding to UT cmake update for protected/private#3773
LeStarch merged 3 commits intonasa:develfrom
m-aleem:devel-3446-ab

Conversation

@m-aleem
Copy link
Contributor

@m-aleem m-aleem commented Jun 21, 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/ActiveLogger so that the UTs in this directory can build and pass.

Approach in this case was:

  1. mv ActiveLoggerTester.cpp ActiveLoggerTestMain.cpp
  2. mv ActiveLoggerImplTester.hpp ActiveLoggerTester.hpp
  3. mv ActiveLoggerImplTester.cpp ActiveLoggerTester.cpp
  4. Change ActiveLoggerImplTester to ActiveLoggerTester where applicable

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 <X>Impl to <X> (separate issue)

@m-aleem m-aleem marked this pull request as ready for review June 21, 2025 01:59
@m-aleem m-aleem closed this Jun 23, 2025
@m-aleem m-aleem reopened this Jun 23, 2025
@m-aleem m-aleem closed this Jun 23, 2025
@m-aleem m-aleem reopened this Jun 23, 2025
@m-aleem m-aleem marked this pull request as draft June 24, 2025 16:42
@m-aleem m-aleem changed the title Updates for Svc/ActiveLogger corresponding to UT cmake udpate for protected/private Updates for Svc/ActiveLogger corresponding to UT cmake update for protected/private Jun 24, 2025
@m-aleem m-aleem marked this pull request as ready for review June 24, 2025 17:59
@m-aleem m-aleem assigned LeStarch and unassigned LeStarch Jun 24, 2025
@m-aleem m-aleem requested a review from LeStarch June 24, 2025 18:29
@LeStarch LeStarch merged commit e5f768e into nasa:devel Jun 25, 2025
50 checks passed
@m-aleem m-aleem deleted the devel-3446-ab 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