Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X

cms-sw · Jan 8, 2014 · 3f2f1fc · 3f2f1fc
2 parents e03ad05 + 4ebc33e
commit 3f2f1fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CommonTools/TrackerMap/bin/print_TrackerMap.cc b/CommonTools/TrackerMap/bin/print_TrackerMap.cc
@@ -57,7 +57,7 @@ void printTrackerMap(const std::string filename, const std::string title, const
   if(withpixel=="Only") {themap.addPixel(false); themap.onlyPixel(true); ratio=16./9.;}
   if(withpixel=="False") {themap.addPixel(false); themap.onlyPixel(false); ratio=8./15.;}
 
-  ifstream input(filename);
+  std::ifstream input(filename);
 
   unsigned int detid;
   float val;

diff --git a/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc b/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc
@@ -49,7 +49,7 @@ TrackingAnalyser::TrackingAnalyser(edm::ParameterSet const& ps) {
   tkMapPSet_ = ps.getParameter<edm::ParameterSet>("TkmapParameters");
 
   std::string localPath = std::string("DQM/TrackingMonitorClient/test/loader.html");
-  ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in);
+  std::ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in);
   char buf[BUF_SIZE];
 
   if (!fin) {

diff --git a/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc b/DQM/TrackingMonitorClient/src/TrackingActionExecutor.cc
@@ -76,7 +76,7 @@ void TrackingActionExecutor::fillStatusAtLumi(DQMStore* dqm_store) {
 //
 void TrackingActionExecutor::createDummyShiftReport(){
   //  std::cout << "[TrackingActionExecutor::createDummyShiftReport]" << std::endl;
-  ofstream report_file;
+  std::ofstream report_file;
   report_file.open("tracking_shift_report.txt", std::ios::out);
   report_file << " Nothing to report!!" << std::endl;
   report_file.close();
@@ -111,7 +111,7 @@ void TrackingActionExecutor::createShiftReport(DQMStore * dqm_store){
   shift_summary << std::endl;
   printShiftHistoParameters(dqm_store, layout_map, shift_summary);
 
-  ofstream report_file;
+  std::ofstream report_file;
   report_file.open("tracking_shift_report.txt", std::ios::out);
   report_file << shift_summary.str() << std::endl;
   report_file.close();