Skip to content

Conversation

@rlalik
Copy link
Contributor

@rlalik rlalik commented Jun 3, 2023

fParams of TF1Params is now of std::unique_ptr type, not raw pointer. Thus I fixed that. Since std::make_unique is not available in c++11 I addedd a simle implementation in a pluto private header.

While saving files some trailing whitespaces were removed.

@PlutoUser
Copy link
Owner

there are some conflicts with the version from GSI Gitlab, could you resolve this?

@rlalik rlalik force-pushed the modern_root_fix branch from 49777ef to 98be4e6 Compare June 22, 2023 16:38
@rlalik
Copy link
Contributor Author

rlalik commented Jun 22, 2023

Can you show me what conflicts are there? I added another improvements which detects root < 6.22 (version where the significant change happen) and perhaps this will fix the issue?

@rlalik
Copy link
Contributor Author

rlalik commented Jun 22, 2023

Ok, I see that there was another fix by Jochen, which was not merged apparently when I made the fork. So now my fix conflicts with his. Perhaps this must be abandon then.

@PlutoUser
Copy link
Owner

We have several ROOT versions (and more to come), I think the solution to use an #if-#elif-#else consstuction is the best way

@PlutoUser
Copy link
Owner

what about this merge, is it still to be merged or should it be closed?

@rlalik
Copy link
Contributor Author

rlalik commented Jul 11, 2023

The fix in other commit which fixed the issue is in conflict with this merge. Those are two different approaches, one could check which one would work better. One can keep this still open for future work but now please check the other PR because the are more urgent.

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