Fix compilation warnings against ROOT6
Merge pull request #2015 from wmtan/FixCompWarningsAgainstROOT6

ROOT6 -- Fix compilation warnings against ROOT6