Skip to content
Closed
Changes from 1 commit
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
Prev Previous commit
[cxxmodules] Also load TreePlayer to fix TDataFrame tests.
It seems automatically loading TreePlayer when TDataFrame is used
without the appropriate include never worked. This was previously
fixed by just adding TreePlayer (which contains TDF) to the PCH.

As always, let's recreate this hack with modules to make restore
the old behavior with modules turned on.
  • Loading branch information
Teemperor committed Nov 14, 2017
commit bb580fe390326fec0f1e01e405c104484e9b70fb
5 changes: 4 additions & 1 deletion core/metacling/src/TCling.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,10 @@ static void LoadCoreModules(cling::Interpreter &interp)
std::vector<std::string> optionalCoreModuleNames = {"stl", "libc"};

// List of core modules we need to load.
std::vector<std::string> neededCoreModuleNames = {"Core", "RIO"};
// FIXME: TreePlayer is here because the rootmap loading doesn't work with
// TDataFrame. This should be gone once we no longer rely on rootmap files
// for loading a module.
std::vector<std::string> neededCoreModuleNames = {"Core", "RIO", "TreePlayer"};
std::vector<std::string> missingCoreModuleNames;

std::vector<clang::Module *> coreModules;
Expand Down