Skip to content

Commit

Permalink
Merge pull request #833 from wmtan/AddStdQualifierOrDirective
Browse files Browse the repository at this point in the history
Add std:: qualifiers or directives
  • Loading branch information
ktf committed Sep 14, 2013
2 parents dbc202a + 3c5d256 commit 6c42086
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ class TEcnaGui : public TGMainFrame {

//==================================================== Miscellaneous parameters

//ofstream fFcout_f;
//std::ofstream fFcout_f;

TString fKeyAnaType; // Type of analysis

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class TEcnaHistos : public TObject {
TVectorD fReadHistoDummy;
TMatrixD fReadMatrixDummy;

ifstream fFcin_f;
std::ifstream fFcin_f;

TString fFapAnaType; // Type of analysis
Int_t fFapNbOfSamples; // Nb of required samples
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class TEcnaParPaths : public TObject {

Int_t fCnaCommand, fCnaError;

ifstream fFcin_rr; // stream for results root files
ifstream fFcin_ra; // stream for results ascii files
ifstream fFcin_lor; // stream for list of runs files
// ifstream fFcin_anapar; // stream for EcnaAnalyzer parameters files
ifstream fFcin_cmssw; // stream for cmssw version and subsystem
std::ifstream fFcin_rr; // stream for results root files
std::ifstream fFcin_ra; // stream for results ascii files
std::ifstream fFcin_lor; // stream for list of runs files
// std::ifstream fFcin_anapar; // stream for EcnaAnalyzer parameters files
std::ifstream fFcin_cmssw; // stream for cmssw version and subsystem

TString fCfgResultsRootFilePath; // absolute path for the results .root files (/afs/etc...)
TString fFileForResultsRootFilePath; // name of the file containing the results .root file path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ class TEcnaRun: public TObject {
Int_t** fT2dCrysNumbersTable;
Int_t* fT1dCrysNumbersTable;

ofstream fFcout_f;
std::ofstream fFcout_f;

Int_t fFlagPrint;
Int_t fCodePrintComments, fCodePrintWarnings, fCodePrintAllComments, fCodePrintNoComment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class TEcnaWrite : public TObject {
TEcnaParPaths *fCnaParPaths;
TEcnaParCout *fCnaParCout;

ofstream fFcout_f;
std::ofstream fFcout_f;

//...................................... Codes for file names
Int_t fCodeHeaderAscii;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaGui.h"
#include <cstdlib>
using namespace std;

//--------------------------------------
// TEcnaGui.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified:24/03/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHeader.h"
using namespace std;

//--------------------------------------
// TEcnaHeader.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//---------Modified: 04/07/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHistos.h"
using namespace std;

//--------------------------------------
// TEcnaHistos.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNArrayD.h"
#include "Riostream.h"
using namespace std;

//--------------------------------------
// TEcnaNArrayD.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified:30/06/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h"
using namespace std;

//--------------------------------------
// TEcnaNumbering.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//----------Copyright: Those valid for CEA sofware
//----------Modified: 24/03/2011
#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaObject.h"
using namespace std;

//--------------------------------------
// TEcnaObject.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified: 24/03/2010

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParCout.h"
using namespace std;

//--------------------------------------
// TEcnaParCout.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParEcal.h"
#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h"
using namespace std;

//--------------------------------------
// TEcnaParEcal.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParHistos.h"
#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h"
using namespace std;

//--------------------------------------
// TEcnaParHistos.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h"
#include <cstdlib>
using namespace std;

//--------------------------------------
// TEcnaParPaths.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified: 04/07/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h"
using namespace std;

//--------------------------------------
// TEcnaRead.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaResultType.h"
#include "Riostream.h"
using namespace std;

//--------------------------------------
// TEcnaResultType.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRootFile.h"
#include "Riostream.h"
using namespace std;

//--------------------------------------
// TEcnaRootFile.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified: 24/03/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h"
using namespace std;

//--------------------------------------
// TEcnaRun.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//----------Modified: 30/06/2011

#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h"
using namespace std;

//--------------------------------------
// TEcnaWrite.cc
Expand Down

0 comments on commit 6c42086

Please sign in to comment.