[misc] do not rely on obsolete Riostream.h header

bindings/tpython/src/TPython.cxx

@@ -23,12 +23,11 @@
 #include "TClassRef.h"
 #include "TObject.h"
 
-#include <Riostream.h>
-
 // Standard
 #include <mutex>
 #include <sstream>
-#include <stdio.h>
+#include <cstdio>
+#include <iostream>
 #include <string>
 
 /// \class TPython

core/base/inc/TParameter.h

@@ -21,16 +21,13 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "Riostream.h"
-
 #include "TObject.h"
-
 #include "TCollection.h"
-
 #include "TString.h"
-
 #include "TROOT.h"
 
+#include <iostream>
+
 template <class AParamType>
 class TParameter : public TObject {
 

core/rint/src/TTabCom.cxx

@@ -144,10 +144,12 @@
 #include "TFunction.h"
 #include "TMethodArg.h"
 #include "TInterpreter.h"
-#include "Riostream.h"
 #include "Rstrstream.h"
 #include "strlcpy.h"
 
+#include <iostream>
+#include <fstream>
+
 #define BUF_SIZE 1024 // must be smaller than/equal to fgLineBufSize in Getline.cxx and
                       // lineBufSize in cppcompleter.py
 #define IfDebug(x)  if(gDebug==TTabCom::kDebug) x

geom/geom/inc/TGeoVector3.h

@@ -12,9 +12,10 @@
 #ifndef ROOT_TGeoVector3
 #define ROOT_TGeoVector3
 
-#include <Riostream.h>
 #include <TMath.h>
 
+#include <iosfwd>
+
 namespace ROOT {
 namespace Geom {
 

geom/geom/src/TGeoTessellated.cxx

@@ -20,6 +20,7 @@ for the composing faces.
 */
 
 #include <iostream>
+#include <fstream>
 #include <sstream>
 
 #include "TGeoManager.h"

geom/geom/src/TGeoVector3.cxx

@@ -16,6 +16,8 @@ Simple 3-vector representation
 
 #include "TGeoVector3.h"
 
+#include <ostream>
+
 std::ostream &operator<<(std::ostream &os, ROOT::Geom::Vertex_t const &vec)
 {
    os << "{" << vec[0] << ", " << vec[1] << ", " << vec[2] << "}";

gui/gui/src/TGFrame.cxx

@@ -2895,7 +2895,11 @@ void TGMainFrame::SaveSource(const char *filename, Option_t *option)
       if (strstr(inc->GetString(), "TRootEmbeddedCanvas"))
          out << "#include \"TCanvas.h\"\n";
    }
-   out << "\n#include \"Riostream.h\"\n\n";
+   // Workaround for https://github.com/llvm/llvm-project/issues/138683
+   // Include <chrono> before <fstream> to ensure _FilesystemClock is defined
+   // Can be removed once the upstream issue is fixed.
+   out << "\n#ifdef __APPLE__\n#include <chrono>\n#endif\n\n";
+   out << "\n#include <fstream>\n#include <iostream>\n#include <iomanip>\n\n";
    // deletes created ListOfIncludes
    gROOT->GetListOfSpecials()->Remove(ilist);
    ilist->Delete();
@@ -3344,7 +3348,11 @@ void TGTransientFrame::SaveSource(const char *filename, Option_t *option)
       if (strstr(inc->GetString(), "TRootEmbeddedCanvas"))
          out << "#include \"TCanvas.h\"\n";
    }
-   out << "\n#include \"Riostream.h\"\n\n";
+   // Workaround for https://github.com/llvm/llvm-project/issues/138683
+   // Include <chrono> before <fstream> to ensure _FilesystemClock is defined
+   // Can be removed once the upstream issue is fixed.
+   out << "\n#ifdef __APPLE__\n#include <chrono>\n#endif\n\n";
+   out << "\n#include <fstream>\n#include <iostream>\n#include <iomanip>\n\n";
    // deletes created ListOfIncludes
    gROOT->GetListOfSpecials()->Remove(ilist);
    ilist->Delete();

hist/hist/src/TConfidenceLevel.cxx

@@ -16,8 +16,8 @@
 #include "TConfidenceLevel.h"
 #include "TH1F.h"
 #include "TMath.h"
-#include "Riostream.h"
 
+#include <iostream>
 
 Double_t const TConfidenceLevel::fgMCLM2S = 0.025;
 Double_t const TConfidenceLevel::fgMCLM1S = 0.16;

hist/hist/src/TF3.cxx

@@ -16,12 +16,9 @@
 #include "TH3.h"
 #include "TVirtualPad.h"
 #include "TRandom.h"
-#include "TVectorD.h"
-#include "Riostream.h"
-#include "TColor.h"
-#include "TVirtualFitter.h"
 #include "TVirtualHistPainter.h"
 #include "Math/IntegratorOptions.h"
+
 #include <cassert>
 
 

hist/hist/src/TGraphMultiErrors.cxx

@@ -13,7 +13,6 @@
 #include "TStyle.h"
 #include "TVirtualPad.h"
 #include "TEfficiency.h"
-#include "Riostream.h"
 
 #include "TArrayD.h"
 #include "TVector.h"
@@ -24,6 +23,8 @@
 
 #include "TGraphMultiErrors.h"
 
+#include <ostream>
+#include <vector>
 
 /** \class TGraphMultiErrors
     \ingroup Graphs

hist/hist/src/TGraphSmooth.cxx

@@ -18,12 +18,11 @@
 *                                                                             *
 ******************************************************************************/
 
-
-#include "Riostream.h"
 #include "TMath.h"
 #include "TGraphSmooth.h"
 #include "TGraphErrors.h"
 
+#include <iostream>
 
 //______________________________________________________________________
 /** \class TGraphSmooth

hist/hist/src/TH2Poly.cxx

@@ -13,8 +13,6 @@
 #include "TH2Poly.h"
 #include "TMultiGraph.h"
 #include "TGraph.h"
-#include "TInterpreter.h"
-#include "Riostream.h"
 #include "TList.h"
 #include "TMath.h"
 #include <cassert>

hist/hist/src/TLimit.cxx

@@ -92,8 +92,8 @@
 #include "TIterator.h"
 #include "TObjString.h"
 #include "TClassTable.h"
-#include "Riostream.h"
 
+#include <iostream>
 
 TArrayD *TLimit::fgTable = new TArrayD(0);
 TOrdCollection *TLimit::fgSystNames = new TOrdCollection();

hist/hist/src/TMultiDimFit.cxx

@@ -385,8 +385,6 @@
 [9]: classTMultiDimFit.html#eq:dS2
 */
 
-
-#include "Riostream.h"
 #include "TMultiDimFit.h"
 #include "TMath.h"
 #include "TH1.h"
@@ -397,6 +395,9 @@
 #include "TDecompChol.h"
 #include "TDatime.h"
 
+#include <fstream>
+#include <iostream>
+#include <iomanip>
 
 #define RADDEG (180. / TMath::Pi())
 #define DEGRAD (TMath::Pi() / 180.)

hist/hist/src/TPolyMarker.cxx

@@ -9,15 +9,13 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#include "Riostream.h"
 #include "TROOT.h"
 #include "TBuffer.h"
 #include "TVirtualPad.h"
 #include "TPolyMarker.h"
 #include "TMath.h"
 
 
-
 /** \class TPolyMarker
     \ingroup Graphs
 A PolyMarker is defined by an array on N points in a 2-D space.

hist/hist/src/TPrincipal.cxx

@@ -218,9 +218,10 @@ Christian Holm August 2000, CERN
 #include "TDatime.h"
 #include "TBrowser.h"
 #include "TROOT.h"
-#include "Riostream.h"
-
 
+#include <fstream>
+#include <iostream>
+#include <iomanip>
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Empty constructor. Do not use.

io/io/src/TStreamerInfo.cxx

@@ -4243,10 +4243,18 @@ UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *ext
       if (ltype < lt) ltype = lt;
       if (ldata < ld) ldata = ld;
 
-      //must include Riostream.h in case of an STL container
+      //must include streaming classes in case of an STL container
       if (!incRiostream && element->InheritsFrom(TStreamerSTL::Class())) {
          incRiostream = kTRUE;
-         TMakeProject::AddInclude( fp, "Riostream.h", kFALSE, inclist);
+#ifdef __APPLE__
+         // Workaround for https://github.com/llvm/llvm-project/issues/138683
+         // Include <chrono> before <fstream> to ensure _FilesystemClock is defined
+         // Can be removed once the upstream issue is fixed.
+         TMakeProject::AddInclude( fp, "chrono", kTRUE, inclist);
+#endif
+         TMakeProject::AddInclude( fp, "fstream", kTRUE, inclist);
+         TMakeProject::AddInclude( fp, "iostream", kTRUE, inclist);
+         TMakeProject::AddInclude( fp, "iomanip", kTRUE, inclist);
       }
 
       //get include file name if any

math/smatrix/test/kalman.C

@@ -1,4 +1,3 @@
-#include "Riostream.h"
 #include "TFile.h"
 #include "TCanvas.h"
 #include "TSystem.h"
@@ -37,7 +36,7 @@
 int read_data(const char *  machine, double * s, double * ss, double * t) {
 
    char filename[100];
    sprintf(filename,"%s.root",machine);
    TFile * file = new TFile(filename,machine);
    if (file == 0) return -1;
    SMatrix<double,9,7,ROOT::Math::MatRepStd<double,9,7> > *ms;
@@ -83,7 +82,7 @@
    double ss[n];
    double t[n];
 
    sprintf(tmachine,"%s",machine);
    c1 = new TCanvas(machine,machine,xtop,ytop,800,650);
    if (read_data(machine,s,ss,t)) return;
 
@@ -131,14 +130,14 @@
    for (i=0;i<=nx;i++) {
       line.DrawLine(xmin+i*dx,ymin,xmin+i*dx,ymax);
       if(i==nx) continue;
       sprintf(text,"%d",i+2);
       ts.DrawText(xmin+(i+0.5)*dx,ymax+0.1*dy,text);
    }
    ts.SetTextAlign(32);
    for (i=0;i<=ny;i++) {
       line.DrawLine(xmin,ymax-i*dy,xmax,ymax-i*dy);
       if(i==ny) continue;
       sprintf(text,"%d",i+2);
       ts.DrawText(xmin-0.1*dx,ymax-(i+0.5)*dy,text);
    }
    tss.SetTextAlign(22);
@@ -152,11 +151,11 @@
    double sumt2  = 0;
    for (i=0;i<nx;i++) {
       for (j=0;j<ny;j++) {
          sprintf(text,"%6.2f",ss[ny*i+j]);
          tss.DrawText(xmin+(i+0.5)*dx,ymax -(j+0.22)*dy,text);
          sprintf(text,"%6.2f",s[ny*i+j]);
          ts.DrawText(xmin+(i+0.5)*dx,ymax -(j+0.5)*dy,text);
          sprintf(text,"%6.2f",t[ny*i+j]);
          tt.DrawText(xmin+(i+0.5)*dx,ymax -(j+0.78)*dy,text);
          if ( i <=cut-2 && j <=cut-2) {
             sums1  += s[ny*i+j];
@@ -175,7 +174,7 @@
    tt.DrawText (xmin+4*dx,0.05,"TMatrix");
    ts.SetTextSize(0.05);
    char title[100];
    sprintf(title,"TestKalman [nx,ny] : %s",tmachine);
    ts.DrawText(0.5,0.96,title);
 
 
@@ -197,7 +196,7 @@
    tt.SetTextAlign(22);
 
    i = 2;
    sprintf(text,"N1,N2 <= %d",cut);
    tl.DrawText (xmin+i*dx-0.15,ylow+0.04,text);
    if (sym == 0) {
       if (sums1 <= sumt1)
@@ -207,7 +206,7 @@
       if (sumss1 <= sumt1)
          box.DrawBox(xmin+i*dx,ylow,xmin+(i+1)*dx,ylow+dy);
    }
    sprintf(text,"%6.2f",sumss1);
    tss.DrawText(xmin+(i+0.5)*dx,ylow+0.078,text);
    sprintf(text,"%6.2f",sums1);
    ts.DrawText(xmin+(i+0.5)*dx,ylow+0.05,text);

net/net/src/TGridJDL.cxx

@@ -12,9 +12,6 @@
 
 #include "TGridJDL.h"
 #include "TObjString.h"
-#include "Riostream.h"
-
-
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Cleanup.

net/net/src/TSQLColumnInfo.cxx

@@ -40,8 +40,8 @@
 #include "TSQLColumnInfo.h"
 #include "TSQLServer.h"
 #include "TROOT.h"
-#include "Riostream.h"
 
+#include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
 /// default contructor

net/net/src/TSQLTableInfo.cxx

@@ -19,15 +19,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
-
 #include "TSQLTableInfo.h"
 
 #include "TSQLColumnInfo.h"
 #include "TList.h"
 #include "TROOT.h"
-#include "Riostream.h"
 
+#include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
 /// default constructor

tmva/tmva/test/stressTMVA.cxx

@@ -2771,7 +2771,6 @@ bool MethodUnitTestWithComplexData::create_data(const char *filename, int nmax)
 // Authors: Christoph Rosemann, Eckhard von Toerne   July 2010
 // TMVA unit tests
 
-#include "Riostream.h"
 #include "TSystem.h"
 #include "TROOT.h"
 #include "TBenchmark.h"