@@ -1862,7 +1862,7 @@ TEST_P(RNTupleMergerCheckEncoding, CorrectEncoding)
18621862 fileMerger.AddFile (nt2.get ());
18631863 // If `useDefaultComp` is true, it's as if we were calling hadd without a -f* flag
18641864 if (useDefaultComp)
1865- fileMerger.SetMergeOptions (TString ( " DefaultCompression" ) );
1865+ fileMerger.SetMergeOptions (" DefaultCompression" );
18661866 fileMerger.Merge ();
18671867
18681868 EXPECT_TRUE (VerifyPageCompression (fileGuard3.GetPath (), expectedComp));
@@ -1948,7 +1948,7 @@ TEST(RNTupleMerger, MergeAsymmetric1TFileMerger)
19481948 fileMerger.OutputFile (fileGuard3.GetPath ().c_str (), " RECREATE" );
19491949 fileMerger.AddFile (nt1.get ());
19501950 fileMerger.AddFile (nt2.get ());
1951- fileMerger.SetMergeOptions (TString ( " rntuple.MergingMode=Filter" ) );
1951+ fileMerger.SetMergeOptions (" rntuple.MergingMode=Filter" );
19521952 CheckDiagsRAII diags;
19531953 diags.requiredDiag (kError , " TFileMerger::Merge" , " error during merge" , false );
19541954 diags.requiredDiag (kError , " ROOT.NTuple.Merge" , " missing the following field" , false );
@@ -1964,7 +1964,7 @@ TEST(RNTupleMerger, MergeAsymmetric1TFileMerger)
19641964 fileMerger.OutputFile (fileGuard3.GetPath ().c_str (), " RECREATE" );
19651965 fileMerger.AddFile (nt1.get ());
19661966 fileMerger.AddFile (nt2.get ());
1967- fileMerger.SetMergeOptions (TString ( " rntuple.MergingMode=Strict" ) );
1967+ fileMerger.SetMergeOptions (" rntuple.MergingMode=Strict" );
19681968 CheckDiagsRAII diags;
19691969 diags.requiredDiag (kError , " TFileMerger::Merge" , " error during merge" , false );
19701970 diags.requiredDiag (kError , " ROOT.NTuple.Merge" , " missing the following field" , false );
@@ -1980,7 +1980,7 @@ TEST(RNTupleMerger, MergeAsymmetric1TFileMerger)
19801980 fileMerger.OutputFile (fileGuard3.GetPath ().c_str (), " RECREATE" );
19811981 fileMerger.AddFile (nt1.get ());
19821982 fileMerger.AddFile (nt2.get ());
1983- fileMerger.SetMergeOptions (TString ( " rntuple.MergingMode=Union" ) );
1983+ fileMerger.SetMergeOptions (" rntuple.MergingMode=Union" );
19841984 CheckDiagsRAII diags;
19851985 diags.optionalDiag (kWarning , " TFileMerger::MergeRecursive" , " Merging RNTuples is experimental" , false );
19861986 auto res = fileMerger.Merge ();
@@ -2672,7 +2672,7 @@ TEST(RNTupleMerger, MergeIncrementalLMExt)
26722672 {
26732673 TFileMerger merger (kFALSE , kFALSE );
26742674 merger.OutputFile (fileGuard.GetPath ().c_str (), " RECREATE" , compression);
2675- merger.SetMergeOptions (TString ( " rntuple.MergingMode=Union" ) );
2675+ merger.SetMergeOptions (" rntuple.MergingMode=Union" );
26762676
26772677 for (int i = 0 ; i < nInputs; ++i) {
26782678 auto tfile = std::unique_ptr<TFile>(TFile::Open (inputFiles[i].GetPath ().c_str (), " READ" ));
@@ -2791,7 +2791,7 @@ TEST(RNTupleMerger, MergeIncrementalLMExtMemFile)
27912791 {
27922792 TFileMerger merger (kFALSE , kFALSE );
27932793 merger.OutputFile (fileGuard.GetPath ().c_str (), " RECREATE" , compression);
2794- merger.SetMergeOptions (TString ( " rntuple.MergingMode=Union" ) );
2794+ merger.SetMergeOptions (" rntuple.MergingMode=Union" );
27952795
27962796 for (int i = 0 ; i < nInputs; ++i) {
27972797 merger.AddFile (inputFiles[i].get ());
@@ -3416,7 +3416,7 @@ TEST(RNTupleMerger, MergeStaggeredIncremental)
34163416 // Merge the files
34173417 TFileMerger merger (false , false );
34183418 merger.OutputFile (fileGuardMerged.GetPath ().c_str (), " RECREATE" , 505 );
3419- merger.SetMergeOptions (TString ( " rntuple.MergingMode=Union" ) );
3419+ merger.SetMergeOptions (" rntuple.MergingMode=Union" );
34203420 for (const auto &f : fileGuardsIn) {
34213421 auto file = std::unique_ptr<TFile>(TFile::Open (f.GetPath ().c_str (), " UPDATE" ));
34223422 merger.AddFile (file.get ());
@@ -3673,7 +3673,7 @@ TEST(RNTupleMerger, GenerateZeroPagesIncremental)
36733673
36743674 {
36753675 TFileMerger merger (kFALSE , kTRUE );
3676- merger.SetMergeOptions (TString ( " rntuple.MergingMode=Union" ) );
3676+ merger.SetMergeOptions (" rntuple.MergingMode=Union" );
36773677 merger.OutputFile (fileGuardOut.GetPath ().c_str (), " RECREATE" ,
36783678 ROOT ::RCompressionSetting::EDefaults::kUseCompiledDefault );
36793679
0 commit comments