[llvm-branch-commits] [cfe-branch] r105033 - /cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri May 28 18:06:32 2010
New Revision: 105033

URL: http://llvm.org/viewvc/llvm-project?rev=105033&view=rev
Log:
Merge r104880:
--
Author: Dan Gohman <gohman at apple.com>
Date:   Thu May 27 20:16:37 2010 +0000

    When handling raw_ostream errors manually, use clear_error() so that
    raw_ostream doesn't try to do its own error handling.

Modified:
    cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp

Modified: cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp?rev=105033&r1=105032&r2=105033&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp (original)
+++ cfe/branches/Apple/whitney/tools/libclang/CIndexer.cpp Fri May 28 18:06:32 2010
@@ -135,6 +135,7 @@
     OS.close();
     if (OS.has_error()) {
       SavedFile.eraseFromDisk();
+      OS.clear_error();
       return true;
     }