Don't hide C++11 constructs from ROOT 6
Merge pull request #4501 from wmtan/RemoveInconsistentPreprocessorMacros

Don't hide C++11 constructs from ROOT 6