[llvm] r354822 - Revert "[Support] Make raw_string_ostream unbuffered"
Roman Lebedev via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 25 13:11:19 PST 2019
Author: lebedevri
Date: Mon Feb 25 13:11:19 2019
New Revision: 354822
URL: http://llvm.org/viewvc/llvm-project?rev=354822&view=rev
Log:
Revert "[Support] Make raw_string_ostream unbuffered"
Shame on me, did not run all the tests, bots are angry.
This reverts commit r354819.
Modified:
llvm/trunk/include/llvm/Support/raw_ostream.h
Modified: llvm/trunk/include/llvm/Support/raw_ostream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/raw_ostream.h?rev=354822&r1=354821&r2=354822&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/raw_ostream.h (original)
+++ llvm/trunk/include/llvm/Support/raw_ostream.h Mon Feb 25 13:11:19 2019
@@ -479,9 +479,6 @@ raw_ostream &nulls();
/// A raw_ostream that writes to an std::string. This is a simple adaptor
/// class. This class does not encounter output errors.
-/// raw_string_ostream operates without a buffer, delegating all memory
-/// management to the std::string. Thus the std::string is always up-to-date,
-/// may be used directly and there is no need to call flush().
class raw_string_ostream : public raw_ostream {
std::string &OS;
@@ -493,16 +490,13 @@ class raw_string_ostream : public raw_os
uint64_t current_pos() const override { return OS.size(); }
public:
- explicit raw_string_ostream(std::string &O)
- : raw_ostream(/*Unbuffered=*/true), OS(O) {}
-
+ explicit raw_string_ostream(std::string &O) : OS(O) {}
~raw_string_ostream() override;
- // FIXME: uncomment and deal with the fallout.
- // void flush() = delete;
-
- /// Returns the string's reference.
+ /// Flushes the stream contents to the target string and returns the string's
+ /// reference.
std::string& str() {
+ flush();
return OS;
}
};
More information about the llvm-commits
mailing list