From 75730106854f322f7df22007da8d867eb86f8e7a Mon Sep 17 00:00:00 2001 From: hsc Date: Wed, 6 Jun 2012 14:27:29 +0000 Subject: [PATCH] no "using namespace std" in a header git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1314 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- core/util/ProtoStream.cc | 4 ++-- core/util/ProtoStream.hpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/util/ProtoStream.cc b/core/util/ProtoStream.cc index 3e322aa7..6d1daa24 100644 --- a/core/util/ProtoStream.cc +++ b/core/util/ProtoStream.cc @@ -2,7 +2,7 @@ using namespace std; -ProtoOStream::ProtoOStream(ostream* outfile) : m_outfile(outfile) +ProtoOStream::ProtoOStream(std::ostream *outfile) : m_outfile(outfile) { m_log.setDescription("ProtoStream"); m_log.showTime(false); @@ -26,7 +26,7 @@ bool ProtoOStream::writeMessage(google::protobuf::Message* m) //PROTOISTREAM -ProtoIStream::ProtoIStream(istream* infile) : m_infile(infile) +ProtoIStream::ProtoIStream(std::istream *infile) : m_infile(infile) { m_log.setDescription("ProtoStream"); m_log.showTime(false); diff --git a/core/util/ProtoStream.hpp b/core/util/ProtoStream.hpp index e3665cc6..077dea01 100644 --- a/core/util/ProtoStream.hpp +++ b/core/util/ProtoStream.hpp @@ -22,8 +22,6 @@ #include "Logger.hpp" -using namespace std; - /** * \class ProtoOStream * @@ -36,10 +34,10 @@ class ProtoOStream uint32_t m_size; Logger m_log; - ostream* m_outfile; + std::ostream* m_outfile; public: - ProtoOStream(ostream * outfile); + ProtoOStream(std::ostream *outfile); virtual ~ProtoOStream() {}; /** * Writes a message to a file. @@ -63,11 +61,11 @@ class ProtoIStream long m_sizeOfInfile; Logger m_log; - istream* m_infile; + std::istream *m_infile; public: - ProtoIStream(istream * infile); + ProtoIStream(std::istream *infile); virtual ~ProtoIStream() {}; /** * Resets the position of the get pointer. After that getNext