Skip to content

[cxxmodules] Do not exclude R related module from preloading #2435

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

Closed
yamaguchi1024 wants to merge 1 commit into from
Closed

[cxxmodules] Do not exclude R related module from preloading #2435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,10 +1303,6 @@ TCling::TCling(const char *name, const char *title, const char* const argv[])
// This should be vector in order to be able to pass it to LoadModules
std::vector<std::string> CoreModules = {"ROOT_Foundation_C","ROOT_Config",
"ROOT_Foundation_Stage1_NoRTTI", "Core", "RIO"};
// These modules contain global variables which conflict with users' code such as "PI".
// FIXME: Reducing those will let us be less dependent on rootmap files
static constexpr std::array<const char*, 4> ExcludeModules =
{ { "Rtools", "RSQLite", "RInterface", "RMVA"} };

LoadModules(CoreModules, *fInterpreter);

Expand All @@ -1324,8 +1320,7 @@ TCling::TCling(const char *name, const char *title, const char* const argv[])

std::string ModuleName = GetModuleNameAsString(M, PP);
if (!ModuleName.empty() &&
std::find(CoreModules.begin(), CoreModules.end(), ModuleName) == CoreModules.end()
&& std::find(ExcludeModules.begin(), ExcludeModules.end(), ModuleName) == ExcludeModules.end()) {
std::find(CoreModules.begin(), CoreModules.end(), ModuleName) == CoreModules.end()) {
if (M->IsSystem && !M->IsMissingRequirement)
LoadModule(ModuleName, *fInterpreter);
else if (!M->IsSystem && !M->IsMissingRequirement)
Expand Down