Skip to content

Commit 72ee658

Browse files
jase231jase231
authored
Merge branch 'root-project:master' into jserwe_scikit_build_core
2 parents 73c9231 + 9916067 commit 72ee658

25 files changed

Lines changed: 742 additions & 265 deletions

File tree

‎.github/workflows/root-ci-config/buildconfig/opensuse16-march_native.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ builtin_tbb=ON
55
builtin_vdt=ON
66
builtin_xrootd=ON
77
builtin_unuran=ON
8-
builtin_nlohmannjson=ON
98
test_distrdf_dask=OFF
109
test_distrdf_pyspark=OFF
1110
tmva-pymva=ON

‎README/ReleaseNotes/v642/index.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ The following people have contributed to this new version:
4646
* The ROOT **auth** package together with `TVirtualAuth` and `TROOT::GetListOfSecContexts()`, and the **authenticated sockets** (`TSocket::CreateAuthSocket()`) feature are now removed following deprecation in ROOT 6.40.
4747
* The `TSSLSocket` class is now removed following deprecation in ROOT 6.40.
4848
* The bindings to the R programming language that are enabled with the `r=ON` or `tmva-rmva=ON` build options (`TRInterface`, RMVA, and friends) are removed, following deprecation in ROOT 6.40. Their maintenance is no longer justified, given the broader adoption of the scientific Python ecosystem. Users who still rely on R from C++ are encouraged to call R directly via https://cran.r-project.org/package=RInside, which is what the ROOT bindings were using internally.
49+
* Several enums that are redundant with `ROOT::ESTLType` are deprecated and will be removed in ROOT 6.44: `TClassEdit::ESTLType`, `TDictionary::ESTLType`, `TStreamerElement::ESTLType`. Please use `ROOT::ESTLType` instead.
4950

5051
## Python Interface
5152

@@ -83,4 +84,4 @@ If the vectorized backend does not work for a given use case, **please report it
8384

8485
The version of the following packages has been updated:
8586

86-
- xrootd: 5.9.5
87+
- xrootd: 5.9.5

‎bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,11 +622,17 @@ std::string Cppyy::ResolveEnum(const std::string& enum_type)
622622
std::ostringstream decl;
623623
// TODO: now presumed fixed with https://sft.its.cern.ch/jira/browse/ROOT-6988
624624
for (auto& itype : {"unsigned int"}) {
625-
decl << "std::is_same<"
625+
// This is pure type introspection: silence any deprecation warning that
626+
// would otherwise be emitted just because the enum being resolved (or its
627+
// scope) happens to be marked deprecated.
628+
decl << "_Pragma(\"clang diagnostic push\")"
629+
"_Pragma(\"clang diagnostic ignored \\\"-Wdeprecated-declarations\\\"\")"
630+
<< "std::is_same<"
626631
<< itype
627632
<< ", std::underlying_type<"
628633
<< et_short
629-
<< ">::type>::value;";
634+
<< ">::type>::value;"
635+
"_Pragma(\"clang diagnostic pop\")";
630636
if (gInterpreter->ProcessLine(decl.str().c_str())) {
631637
// TODO: "re-sugaring" like this is brittle, but the top
632638
// should be re-translated into AST-based code anyway

‎builtins/rendercore/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ExternalProject_Add(
22
RENDERCORE
3-
URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-2.0.tar.gz
4-
URL_HASH SHA256=6bdcf70fbdec1f950057ab1df722775c468ad6894f8a364f15f589d58c326667
3+
URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-2.1.tar.gz
4+
URL_HASH SHA256=fee8250baf8e5e1946170dd91e312d2f4a86f8dedd7f8c4e744c6671587114ab
55
CONFIGURE_COMMAND ""
66
BUILD_COMMAND ""
77
INSTALL_COMMAND ""

‎builtins/rendercore/RenderCore-2.0.tar.gz‎

-98.3 KB
Binary file not shown.

‎builtins/rendercore/RenderCore-2.1.tar.gz‎

97.8 KB
Binary file not shown.

‎cmake/modules/RootMacros.cmake‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -623,22 +623,17 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
623623
#---Get the library and module dependencies-----------------
624624
if(ARG_DEPENDENCIES)
625625
foreach(dep ${ARG_DEPENDENCIES})
626-
if(NOT TARGET G__${dep})
627-
# This is a library that doesn't come with dictionary/pcm
628-
continue()
629-
endif()
630-
626+
# Whether <dep> provides a dictionary/pcm is decided at generation time
627+
# via $<TARGET_EXISTS:G__<dep>>, so the '-m' flag and the module-file
628+
# dependency below are independent of configuration order and expand to
629+
# nothing for a dictionary-less library.
630+
set(dep_has_dict "$<TARGET_EXISTS:G__${dep}>")
631631
set(dependent_pcm ${libprefix}${dep}_rdict.pcm)
632632
if (runtime_cxxmodules AND NOT dep IN_LIST local_no_cxxmodules)
633633
set(dependent_pcm ${dep}.pcm)
634-
if(TARGET ${dep})
635-
get_target_property(_dep_pcm_filename ${dep} ROOT_PCM_FILENAME)
636-
if(_dep_pcm_filename)
637-
list(APPEND pcm_dependencies ${_dep_pcm_filename})
638-
endif()
639-
endif()
634+
list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
640635
endif()
641-
set(newargs ${newargs} -m ${dependent_pcm})
636+
set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
642637
endforeach()
643638
endif()
644639

‎core/foundation/inc/TClassEdit.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ namespace TClassEdit {
9191
kDropHash = 1<<13 /* Drop the hash if applies to the collection */
9292
};
9393

94-
enum ESTLType {
95-
kNotSTL = ROOT::kNotSTL,
96-
kVector = ROOT::kSTLvector,
97-
kList = ROOT::kSTLlist,
98-
kForwardlist = ROOT::kSTLforwardlist,
99-
kDeque = ROOT::kSTLdeque,
100-
kMap = ROOT::kSTLmap,
101-
kMultiMap = ROOT::kSTLmultimap,
102-
kSet = ROOT::kSTLset,
103-
kMultiSet = ROOT::kSTLmultiset,
104-
kUnorderedSet = ROOT::kSTLunorderedset,
105-
kUnorderedMultiSet = ROOT::kSTLunorderedmultiset,
106-
kUnorderedMap = ROOT::kSTLunorderedmap,
107-
kUnorderedMultiMap = ROOT::kSTLunorderedmultimap,
108-
kBitSet = ROOT::kSTLbitset,
109-
kEnd = ROOT::kSTLend
94+
enum R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") ESTLType {
95+
kNotSTL R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kNotSTL,
96+
kVector R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
97+
kList R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
98+
kForwardlist R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
99+
kDeque R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
100+
kMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
101+
kMultiMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
102+
kSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
103+
kMultiSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
104+
kUnorderedSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
105+
kUnorderedMultiSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
106+
kUnorderedMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
107+
kUnorderedMultiMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
108+
kBitSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset,
109+
kEnd R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLend
110110
};
111111

112112
enum class EComplexType : short {

‎core/meta/inc/TDictionary.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -195,21 +195,21 @@ class TDictionary : public TNamed {
195195
static TDictionary* GetDictionary(const std::type_info &typeinfo);
196196

197197
// Type of STL container (returned by IsSTLContainer).
198-
enum ESTLType {
199-
kNone = ROOT::kNotSTL,
200-
kVector = ROOT::kSTLvector,
201-
kList = ROOT::kSTLlist,
202-
kForwardlist = ROOT::kSTLforwardlist,
203-
kDeque = ROOT::kSTLdeque,
204-
kMap = ROOT::kSTLmap,
205-
kMultimap = ROOT::kSTLmultimap,
206-
kSet = ROOT::kSTLset,
207-
kMultiset = ROOT::kSTLmultiset,
208-
kUnorderedSet = ROOT::kSTLunorderedset,
209-
kUnorderedMultiset = ROOT::kSTLunorderedmultiset,
210-
kUnorderedMap = ROOT::kSTLunorderedmap,
211-
kUnorderedMultimap = ROOT::kSTLunorderedmultimap,
212-
kBitset = ROOT::kSTLbitset
198+
enum R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") ESTLType {
199+
kNone R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kNotSTL,
200+
kVector R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
201+
kList R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
202+
kForwardlist R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
203+
kDeque R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
204+
kMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
205+
kMultimap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
206+
kSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
207+
kMultiset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
208+
kUnorderedSet R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
209+
kUnorderedMultiset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
210+
kUnorderedMap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
211+
kUnorderedMultimap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
212+
kBitset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset
213213
};
214214

215215
/// Kinds of members to include in lists.

‎core/meta/inc/TStreamerElement.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ class TStreamerElement : public TNamed {
4949

5050
public:
5151

52-
enum ESTLtype {
53-
kSTL = ROOT::kSTLany,
54-
kSTLstring = ROOT::kSTLstring,
55-
kSTLvector = ROOT::kSTLvector,
56-
kSTLlist = ROOT::kSTLlist,
57-
kSTLforwardlist = ROOT::kSTLforwardlist,
58-
kSTLdeque = ROOT::kSTLdeque,
59-
kSTLmap = ROOT::kSTLmap,
60-
kSTLmultimap = ROOT::kSTLmultimap,
61-
kSTLset = ROOT::kSTLset,
62-
kSTLmultiset = ROOT::kSTLmultiset,
63-
kSTLunorderedset = ROOT::kSTLunorderedset,
64-
kSTLunorderedmultiset = ROOT::kSTLunorderedmultiset,
65-
kSTLunorderedmap = ROOT::kSTLunorderedmap,
66-
kSTLunorderedmultimap = ROOT::kSTLunorderedmultimap,
67-
kSTLbitset = ROOT::kSTLbitset
52+
enum R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") ESTLtype {
53+
kSTL R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLany,
54+
kSTLstring R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLstring,
55+
kSTLvector R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
56+
kSTLlist R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
57+
kSTLforwardlist R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
58+
kSTLdeque R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
59+
kSTLmap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
60+
kSTLmultimap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
61+
kSTLset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
62+
kSTLmultiset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
63+
kSTLunorderedset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
64+
kSTLunorderedmultiset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
65+
kSTLunorderedmap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
66+
kSTLunorderedmultimap R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
67+
kSTLbitset R__DEPRECATED(6, 44, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset
6868
};
6969
// TStreamerElement status bits
7070
enum EStatusBits {

0 commit comments

Comments
 (0)