Skip to content

Commit 1fa856f

Browse files
committed
Remove the auto_ptr dictionary and demote the resulting message in InitRootHandlers
The demoted message effectively tells that the dictionary for auto_ptr is missing. If we don't consider the message as an error, ROOT will auto-parse the necessary header. This auto-parsing was deemed to be less bad than keeping the dictionary for auto_ptr (with the compiler warnings etc).
1 parent 190a50b commit 1fa856f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DataFormats/TestObjects/src/classes_def.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ exception when running testMissingDictionaryChecking_cfg.py.
410410
<version ClassVersion="4" checksum="3437951039"/>
411411
<version ClassVersion="3" checksum="1545257825"/>
412412
</class>
413-
<class name="std::auto_ptr<edmtest::SchemaEvolutionContained>"/>
414413
<class name="edmtest::compat::deprecated_auto_ptr<edmtest::SchemaEvolutionContained>"/>
415414
<class name="edmtest::SchemaEvolutionAutoPtrToUniquePtr" ClassVersion="4">
416415
<version ClassVersion="4" checksum="2908944573"/>

FWCore/Services/plugins/InitRootHandlers.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ namespace {
164164
}
165165

166166
//Contents of a message which should be reported as an INFO not a ERROR
167-
constexpr std::array<const char* const, 11> in_message{
167+
constexpr std::array<const char* const, 12> in_message{
168168
{"no dictionary for class",
169169
"already in TClassTable",
170170
"matrix not positive definite",
@@ -175,7 +175,8 @@ namespace {
175175
"nbinsy is <=0 - set to nbinsy = 1",
176176
"oneapi::tbb::global_control is limiting",
177177
"ufirst < fXmin, fXmin is used",
178-
"ulast > fXmax, fXmax is used"}};
178+
"ulast > fXmax, fXmax is used",
179+
"Inspection for auto_ptr"}};
179180

180181
//Location generating messages which should be reported as an INFO not a ERROR
181182
constexpr std::array<const char* const, 7> in_location{{"Fit",

0 commit comments

Comments
 (0)