Skip to content

[trivial] [hotfix] Remove some code that somehow got copied #1012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2024

Conversation

Yurlungur
Copy link
Collaborator

@Yurlungur Yurlungur commented Mar 4, 2024

PR Summary

In PR #1007 , I moved some of the string parameter template specializations into their own file. For whatever reason, this move didn't stick when the branch was merged, and the code is now duplicated. This PR removes the duplicated code, which prevents linking on some platforms.

PR Checklist

  • Code passes cpplint
  • New features are documented.
  • Adds a test for any bugs fixed. Adds tests for new features.
  • Code is formatted
  • Changes are summarized in CHANGELOG.md
  • Change is breaking (API, behavior, ...)
    • Change is additionally added to CHANGELOG.md in the breaking section
    • PR is marked as breaking
    • Short summary API changes at the top of the PR (plus optionally with an automated update/fix script)
  • CI has been triggered on Darwin for performance regression tests.
  • Docs build
  • (@lanl.gov employees) Update copyright on changed files

@Yurlungur Yurlungur self-assigned this Mar 4, 2024
@Yurlungur Yurlungur enabled auto-merge March 4, 2024 23:59
Copy link
Collaborator

@lroberts36 lroberts36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@AstroBarker AstroBarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved phoebus compilation issue on Darwin. Thanks!

@Yurlungur Yurlungur merged commit 3225612 into develop Mar 5, 2024
49 checks passed
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.

5 participants