Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to ROOT pre-6.06 (almost final) #12713

Merged
merged 4 commits into from
Dec 9, 2015
Merged

Move to ROOT pre-6.06 (almost final) #12713

merged 4 commits into from
Dec 9, 2015

Commits on Dec 8, 2015

  1. New checksum for edm::StreamedProduct class needed for ROOT 6.04.00 

    Chekcsum changed for `edm::StreamedProduct` class. Modify for ROOT
6.04.00.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
    David Abdurachmanov authored and David Abdurachmanov committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    2f3a42e View commit details
    Browse the repository at this point in the history

  2. Remove std::iterator selection rules 

    The following always are unused rules and always fails `genreflex`.
Remove them as not needed.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
    David Abdurachmanov authored and David Abdurachmanov committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    3e0025f View commit details
    Browse the repository at this point in the history

  3. Remove duplicate classes 

    Resolve the following run-time warnings/errors on ROOT 6.04.00:

    Warning in <TInterpreter::ReadRootmapFile>: class pair<const int,int> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<const std::string,int> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<const string,int> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<double,double> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<float,float> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<int,double> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<int,int> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<std::string,int> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<string,double> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<string,float> found in libCore.so is already in libDataFormatsStdDictionaries.so
    Warning in <TInterpreter::ReadRootmapFile>: class pair<string,int> found in libCore.so is already in libDataFormatsStdDictionaries.so

There types are already defined in `libCore.so`. ROOT 6 built with
configure/Makfile does not generate `libCore.rootmap`, but it does
once built with CMake.
    David Abdurachmanov authored and David Abdurachmanov committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    59892be View commit details
    Browse the repository at this point in the history

  4. Remove *TSchemaHelper* classes from the dictionary 

    ROOT commit (8a44438d5707dd96eeab5fbf9a928378f92f07ce) renamed
`ROOT::TSchemaHelper` to `ROOT::Internal::TSchemaHelper`.

Christopher Jones checked the package history and it looks like
`TSchemaHelper` was just a victim of the original pattern being way to
inclusive. It also seems not to be used by CMSSW.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
    David Abdurachmanov authored and David Abdurachmanov committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    27ceb93 View commit details
    Browse the repository at this point in the history