Temporary workaround for ROOT6 bug
Merge pull request #3215 from wmtan/WorkaroundForROOT6typedefBug

Temporary workaround for ROOT6 bug