diff --git a/dune/xt/common/logging.cc b/dune/xt/common/logging.cc index 7aca06c86433cdf9c17508a8038d04018a456350..0e31e2275a498f8b719cd04a40f28837d082b288 100644 --- a/dune/xt/common/logging.cc +++ b/dune/xt/common/logging.cc @@ -119,8 +119,9 @@ int Logging::add_stream(int flags) streamID_int <<= 1; int streamID = streamID_int; streamIDs_.push_back(streamID); - flagmap_[streamID] = (flags | streamID); - streammap_[streamID] = Dune::XT::Common::make_unique<DualLogStream>(streamID, flagmap_[streamID], std::cout, logfile_); + flagmap_[streamID] = (flags | streamID); + streammap_[streamID] = + Dune::XT::Common::make_unique<DualLogStream>(streamID, flagmap_[streamID], std::cout, logfile_); return streamID_int; } // add_stream diff --git a/dune/xt/common/logstreams.cc b/dune/xt/common/logstreams.cc index 22eb7f501089d8bbe7182ef8cf8ad9e2c06e0436..9681fde50fe09f694b279eebe93fe0bcc3fab7f3 100644 --- a/dune/xt/common/logstreams.cc +++ b/dune/xt/common/logstreams.cc @@ -165,18 +165,18 @@ int EmptyBuffer::sync() int CombinedBuffer::pubsync() { - if(!enabled()) + if (!enabled()) return 0; int ret; - for(auto&& buffer_ptr : buffer_) + for (auto&& buffer_ptr : buffer_) ret = buffer_ptr->pubsync(); return ret; } -std::streamsize CombinedBuffer::xsputn(const char_type *s, std::streamsize count) +std::streamsize CombinedBuffer::xsputn(const char_type* s, std::streamsize count) { std::streamsize ret; - for(auto&& buffer_ptr : buffer_) + for (auto&& buffer_ptr : buffer_) ret = buffer_ptr->xsputn(s, count); return ret; } @@ -184,7 +184,7 @@ std::streamsize CombinedBuffer::xsputn(const char_type *s, std::streamsize count CombinedBuffer::int_type CombinedBuffer::overflow(int_type ch) { int_type ret; - for(auto&& buffer_ptr : buffer_) + for (auto&& buffer_ptr : buffer_) ret = buffer_ptr->overflow(ch); return ret; } @@ -192,23 +192,23 @@ CombinedBuffer::int_type CombinedBuffer::overflow(int_type ch) int CombinedBuffer::sync() { int ret; - for(auto&& buffer_ptr : buffer_) + for (auto&& buffer_ptr : buffer_) ret = buffer_ptr->sync(); return ret; } -DualLogStream::DualLogStream(int loglevel, int &logflags, std::ostream &out, std::ofstream &file) - : LogStream(new CombinedBuffer(loglevel, logflags, {new OstreamBuffer(loglevel, logflags, out), - new OstreamBuffer(loglevel, logflags, file)})) +DualLogStream::DualLogStream(int loglevel, int& logflags, std::ostream& out, std::ofstream& file) + : LogStream(new CombinedBuffer( + loglevel, logflags, {new OstreamBuffer(loglevel, logflags, out), new OstreamBuffer(loglevel, logflags, file)})) { } -OstreamLogStream::OstreamLogStream(int loglevel, int &logflags, std::ostream &out) +OstreamLogStream::OstreamLogStream(int loglevel, int& logflags, std::ostream& out) : LogStream(new OstreamBuffer(loglevel, logflags, out)) { } -EmptyLogStream::EmptyLogStream(int &logflags) +EmptyLogStream::EmptyLogStream(int& logflags) : LogStream(new EmptyBuffer(int(LOG_NONE), logflags)) { } diff --git a/dune/xt/common/logstreams.hh b/dune/xt/common/logstreams.hh index 040786e25f5218d159bd3304d9a4496a00575981..0c685c87e4aa42e2e51f5eb6d1996d6ada4b23dd 100644 --- a/dune/xt/common/logstreams.hh +++ b/dune/xt/common/logstreams.hh @@ -109,7 +109,7 @@ public: CombinedBuffer(int loglevel, int& logflags, std::initializer_list<SuspendableStrBuffer*> buffer_input) : SuspendableStrBuffer(loglevel, logflags) { - for(auto&& buffer_ptr : buffer_input) { + for (auto&& buffer_ptr : buffer_input) { buffer_.emplace_back(buffer_ptr); } }