From 0659928fec02d5a953e528739cc036f7a68deb63 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 16 Jun 2014 16:08:36 +0000 Subject: Convert the Archive API to use ErrorOr. Now that we have c++11, even things like ErrorOr> are easy to use. No intended functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211033 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-size/llvm-size.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/llvm-size/llvm-size.cpp') diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp index 1ea22a937a..ebd41a5280 100644 --- a/tools/llvm-size/llvm-size.cpp +++ b/tools/llvm-size/llvm-size.cpp @@ -245,12 +245,12 @@ static void PrintFileSectionSizes(StringRef file) { // This is an archive. Iterate over each member and display its sizes. for (object::Archive::child_iterator i = a->child_begin(), e = a->child_end(); i != e; ++i) { - std::unique_ptr child; - if (std::error_code ec = i->getAsBinary(child)) { - errs() << ToolName << ": " << file << ": " << ec.message() << ".\n"; + ErrorOr> ChildOrErr = i->getAsBinary(); + if (std::error_code EC = ChildOrErr.getError()) { + errs() << ToolName << ": " << file << ": " << EC.message() << ".\n"; continue; } - if (ObjectFile *o = dyn_cast(child.get())) { + if (ObjectFile *o = dyn_cast(&*ChildOrErr.get())) { if (OutputFormat == sysv) outs() << o->getFileName() << " (ex " << a->getFileName() << "):\n"; -- cgit v1.2.3