From e69170a11079504e1b20ec79296925f295dc01c0 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Thu, 26 Jun 2014 22:52:05 +0000 Subject: Revert "Introduce a string_ostream string builder facilty" Temporarily back out commits r211749, r211752 and r211754. llvm-svn: 211814 --- llvm/lib/Object/MachOObjectFile.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Object/MachOObjectFile.cpp') diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 2511a4a..dbfc072 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -301,7 +301,7 @@ static unsigned getCPUType(const MachOObjectFile *O) { static void printRelocationTargetName(const MachOObjectFile *O, const MachO::any_relocation_info &RE, - raw_ostream &fmt) { + raw_string_ostream &fmt) { bool IsScattered = O->isRelocationScattered(RE); // Target of a scattered relocation is an address. In the interest of @@ -1010,7 +1010,8 @@ MachOObjectFile::getRelocationValueString(DataRefImpl Rel, unsigned Arch = this->getArch(); - string_ostream fmt; + std::string fmtbuf; + raw_string_ostream fmt(fmtbuf); unsigned Type = this->getAnyRelocationType(RE); bool IsPCRel = this->getAnyRelocationPCRel(RE); @@ -1173,7 +1174,7 @@ MachOObjectFile::getRelocationValueString(DataRefImpl Rel, } else printRelocationTargetName(this, RE, fmt); - StringRef fmtbuf = fmt.str(); + fmt.flush(); Result.append(fmtbuf.begin(), fmtbuf.end()); return object_error::success; } -- cgit v1.1