Skip to content

Commit 3a3de73

Browse files
committed
[interpreter] remove no longer needed multimap/set headers
1 parent ceefbb7 commit 3a3de73

File tree

4 files changed

+1
-19
lines changed

4 files changed

+1
-19
lines changed

core/clingutils/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ foreach(dict ${stldicts})
7777
LINKDEF src/${dict}Linkdef.h
7878
DICTIONARY_OPTIONS --noIncludePaths
7979
DEPENDENCIES Core)
80-
target_include_directories(${dict}Dict PRIVATE ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint)
8180
endforeach()
8281

8382
set(CLANG_RESOURCE_DIR_STEM)
@@ -185,12 +184,6 @@ foreach(file ${custom_modulemaps}
185184
install(FILES ${CMAKE_BINARY_DIR}/etc/cling/${dest_file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
186185
endforeach()
187186

188-
foreach(file multimap multiset)
189-
list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file} ${CMAKE_BINARY_DIR}/etc/cling/cint/${file})
190-
list(APPEND files_to_copy ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file})
191-
install(FILES ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/cint)
192-
endforeach()
193-
194187
set(stamp_file ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LLVMRES.stamp)
195188
if(MSVC)
196189
add_custom_command(OUTPUT ${stamp_file}

core/dictgen/src/rootcling_impl.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4750,8 +4750,7 @@ int RootClingMain(int argc,
47504750
// interpPragmaSource and we still need to process it.
47514751

47524752
LinkdefReader ldefr(interp, constructorTypes);
4753-
clingArgs.push_back("-Ietc/cling/cint"); // For multiset and multimap
4754-
4753+
47554754
if (!ldefr.Parse(selectionRules, interpPragmaSource, clingArgs,
47564755
llvmResourceDir.c_str())) {
47574756
ROOT::TMetaUtils::Error(nullptr, "Parsing #pragma failed %s\n", linkdefFilename.c_str());

interpreter/cling/include/cling/cint/multimap

Lines changed: 0 additions & 5 deletions
This file was deleted.

interpreter/cling/include/cling/cint/multiset

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)