Skip to content
Snippets Groups Projects

Fix name clash of define statement

Merged Florian Uhlig requested to merge f.uhlig/cbmroot:fix_issue_2051 into master

When reordering the include statements a name clash between a define statement in L1 code and a function in Root's TF1.h was found which did not allow to compile the code. Rename the define statement such that the name clash is resolved. refs #2051

Merge request reports

Merge request pipeline #9934 passed

Merge request pipeline passed for 982dfb7c

Approval is optional

Merged by Sergey GorbunovSergey Gorbunov 4 years ago (May 10, 2021 10:32am UTC)

Merge details

  • Changes merged into master with 982dfb7c.
  • Deleted the source branch.

Pipeline #9972 passed

Pipeline passed for 982dfb7c on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading