Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/python/pyLCIO/base/HandleExceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
import pyLCIO
import pyLCIO.exceptions.Exceptions

# Cope with API change with ROOT version >= 6.32
if ROOT.gROOT.GetVersionCode() >= (6<<16) + (32<<8) :
from cppyy.types import Function as CPPOverload
# Cope with API change with ROOT version >= 6.21
if ROOT.gROOT.GetVersionCode() >= (6<<16) + (21<<8) :
elif ROOT.gROOT.GetVersionCode() >= (6<<16) + (21<<8) :
# libcppyy has been moved in ROOT 6.38 and can no longer be imported
from libcppyy import CPPOverload
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add a comment here that this is removed with ROOT 6.36, so that we have a chance to remove this without having to do git archeology?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, I added a comment.

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks :)

else:
CPPOverload = ROOT.MethodProxy
Expand Down