From f3e488476e1bdfe9de6daddcd1cd452c9d874b56 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 12 Aug 2009 20:52:45 +0000 Subject: [PATCH] Add a GetBufferSize() member to raw_ostream and use it to simplify some formatted_raw_ostream code. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78836 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FormattedStream.h | 3 +-- include/llvm/Support/raw_ostream.h | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/llvm/Support/FormattedStream.h b/include/llvm/Support/FormattedStream.h index 8d6dca66541..11a0e18db4c 100644 --- a/include/llvm/Support/FormattedStream.h +++ b/include/llvm/Support/FormattedStream.h @@ -116,8 +116,7 @@ namespace llvm // own buffering, and it doesn't need or want TheStream to do another // layer of buffering underneath. Resize the buffer to what TheStream // had been using, and tell TheStream not to do its own buffering. - TheStream->flush(); - if (size_t BufferSize = TheStream->GetNumBytesInBuffer()) + if (size_t BufferSize = TheStream->GetBufferSize()) SetBufferSize(BufferSize); TheStream->SetUnbuffered(); diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index 09ee03098f4..5f6578fcb50 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -106,6 +106,10 @@ public: Unbuffered = false; } + size_t GetBufferSize() const { + return OutBufEnd - OutBufStart; + } + /// SetUnbuffered - Set the streams buffering status. When /// unbuffered the stream will flush after every write. This routine /// will also flush the buffer immediately when the stream is being -- 2.34.1