diff --git a/IOPool/Streamer/src/StreamDQMInputFile.cc b/IOPool/Streamer/src/StreamDQMInputFile.cc index e8cc391fde37b..f5927b1f8d5e6 100644 --- a/IOPool/Streamer/src/StreamDQMInputFile.cc +++ b/IOPool/Streamer/src/StreamDQMInputFile.cc @@ -12,7 +12,7 @@ StreamDQMInputFile::~StreamDQMInputFile() StreamDQMInputFile::StreamDQMInputFile(const std::string& name): currentEvMsg_(), - ist_(new ifstream(name.c_str())), + ist_(new std::ifstream(name.c_str())), eventBuf_(1000*1000*7) { diff --git a/IOPool/Streamer/src/Utilities.cc b/IOPool/Streamer/src/Utilities.cc index 068239ae6daa6..29061f5d6085e 100644 --- a/IOPool/Streamer/src/Utilities.cc +++ b/IOPool/Streamer/src/Utilities.cc @@ -162,7 +162,7 @@ namespace edm return rc; } - std::auto_ptr readHeaderFromStream(ifstream& ist) + std::auto_ptr readHeaderFromStream(std::ifstream& ist) { JobHeaderDecoder decoder; std::vector regdata(1000*1000); @@ -208,7 +208,7 @@ namespace edm { edm::ProductRegistry pr; edm::BranchIDListHelper bidlh; - ifstream ist(filename.c_str(), std::ios_base::binary | std::ios_base::in); + std::ifstream ist(filename.c_str(), std::ios_base::binary | std::ios_base::in); if(!ist) { diff --git a/IOPool/Streamer/test/EventBuffer_t.cpp b/IOPool/Streamer/test/EventBuffer_t.cpp index 32afd8c4bba7e..9f245ff5a1782 100644 --- a/IOPool/Streamer/test/EventBuffer_t.cpp +++ b/IOPool/Streamer/test/EventBuffer_t.cpp @@ -50,7 +50,7 @@ void Producer::operator()() EventBuffer::ProducerBuffer ib(*b_); int* v = (int*)ib.buffer(); *v = i; - //cout << "P" << i << std::endl; + //std::cout << "P" << i << std::endl; ib.commit(sizeof(int)); } diff --git a/IOPool/Streamer/test/PackBitsTest.cpp b/IOPool/Streamer/test/PackBitsTest.cpp index e924f31deda53..ee1fe5b249ce6 100644 --- a/IOPool/Streamer/test/PackBitsTest.cpp +++ b/IOPool/Streamer/test/PackBitsTest.cpp @@ -11,12 +11,12 @@ void printCharBits(unsigned char c){ } void packIntoString(std::vector const& source, - vector& package) + std::vector& package) { unsigned int packInOneByte = 4; unsigned int sizeOfPackage = 1+((source.size()-1)/packInOneByte); //Two bits per HLT -cout << "sizeOfPackage: "< source; +std::vector source; //Mind that Only 2 LSBs are Important source.push_back(0); @@ -59,9 +63,9 @@ source.push_back(2); source.push_back(3); //source.push_back(5); -vector hltbits; +std::vector hltbits; packIntoString(source, hltbits); -cout<<"\nSource Was: \n"; +std::cout<<"\nSource Was: \n"; string space=" "; for (unsigned int i=source.size()-1;i!=-1;--i) { space=+" "; diff --git a/IOPool/Streamer/test/ParamSetWalker_t.cpp b/IOPool/Streamer/test/ParamSetWalker_t.cpp index 0d6c617210691..07de75411d29a 100644 --- a/IOPool/Streamer/test/ParamSetWalker_t.cpp +++ b/IOPool/Streamer/test/ParamSetWalker_t.cpp @@ -22,8 +22,8 @@ class ParamSetWalker { boost::shared_ptr procPset = pdesc.getProcessPSet(); std::cout<< "Process PSet:" << procPset->toString() << std::endl; - //cout << "Module Label: " << procPset->getParameter("@module_label") - // << std::endl; + //std::cout << "Module Label: " << procPset->getParameter("@module_label") + // << std::endl; edm::ParameterSet const& allTrigPaths = procPset->getParameterSet("@trigger_paths"); std::cout << "Found Trig Path :" << allTrigPaths.toString() << std::endl; @@ -44,7 +44,7 @@ class ParamSetWalker { { std::cout << "Found an end Path :" << (*it) << std::endl; //Lets try to get this PSet from the Process PSet - vector anEndPath = procPset->getParameter >((*it)); + std::vector anEndPath = procPset->getParameter >((*it)); for(std::vector::iterator it = anEndPath.begin(), itEnd = anEndPath.end(); it != itEnd; ++it) { std::cout << "Found a end Path PSet :" << (*it) << std::endl; @@ -54,11 +54,11 @@ class ParamSetWalker { throw cms::Exception("ParamSetWalker","ParamSetWalker") << "Empty End Path Found in the Config File" << std::endl; std::cout << "This Module PSet is: " << aModInEndPathPset.toString() << std::endl; - std::string mod_type = aModInEndPathPset.getParameter ("@module_type"); + std::string mod_type = aModInEndPathPset.getParameter ("@module_type"); std::cout << "Type of This Module is: " << mod_type << std::endl; if (mod_type == "EventStreamFileWriter") { std::cout << "FOUND WHAT WAS LOOKING FOR:::" << std::endl; - std::string fileName = aModInEndPathPset.getParameter ("fileName"); + std::string fileName = aModInEndPathPset.getParameter ("fileName"); std::cout << "Streamer File Name:" << fileName << std::endl; edm::ParameterSet selectEventsPSet const& = aModInEndPathPset.getUntrackedParameterSet("SelectEvents"); @@ -79,7 +79,7 @@ class ParamSetWalker { int main() { - string test_config = "process PROD = { + std::string test_config = "process PROD = { untracked PSet maxEvents = { untracked int32 input = 10 } untracked PSet options = { untracked bool wantSummary=false @@ -95,7 +95,7 @@ int main() { bool use_compression = true int32 compression_level = 1 - string fileName = \"teststreamfile.dat\" + std::string fileName = \"teststreamfile.dat\" # untracked int32 numPerFile = 5 untracked PSet SelectEvents = { vstring SelectEvents={\"p2\"}} } diff --git a/IOPool/Streamer/test/StreamThingAnalyzer.cc b/IOPool/Streamer/test/StreamThingAnalyzer.cc index a51ef3829dda4..4ab4642587a57 100644 --- a/IOPool/Streamer/test/StreamThingAnalyzer.cc +++ b/IOPool/Streamer/test/StreamThingAnalyzer.cc @@ -52,7 +52,7 @@ namespace edmtest_thing ProdList::iterator i(prod.begin()),end(prod.end()); for(; i != end; ++i) total_ = accumulate((*i)->data_.begin(),(*i)->data_.end(),total_); - //cout << tot << std::endl; + //std::cout << tot << std::endl; #if 0 for(i = prod.begin();i != end; ++i) {