From 05ead076b4a58cd18eee35ea97f9577333f6af38 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 28 Aug 2014 11:33:32 +0200 Subject: Adapt compilerplugins to Clang trunk towards 3.6 Change-Id: Id1ce6c59f705f9c42855995e0ad590c6a3646613 --- compilerplugins/clang/compat.hxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'compilerplugins/clang') diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx index 5533e8f2890e..e6ce98ea64bd 100644 --- a/compilerplugins/clang/compat.hxx +++ b/compilerplugins/clang/compat.hxx @@ -151,7 +151,13 @@ inline unsigned getCustomDiagID( inline std::unique_ptr create_raw_fd_ostream( char const * Filename, std::string & ErrorInfo) { -#if (__clang_major__ == 3 && __clang_minor__ >= 5) || __clang_major__ > 3 +#if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3 + std::error_code ec; + std::unique_ptr s( + new llvm::raw_fd_ostream(Filename, ec, llvm::sys::fs::F_None)); + ErrorInfo = ec ? "error: " + ec.message() : std::string(); + return s; +#elif __clang_major__ == 3 && __clang_minor__ == 5 return std::unique_ptr( new llvm::raw_fd_ostream(Filename, ErrorInfo, llvm::sys::fs::F_None)); #else -- cgit