mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt compilerplugins to Clang trunk towards 3.6

Browse Source 
Change-Id: Id1ce6c59f705f9c42855995e0ad590c6a3646613
This commit is contained in:
Stephan Bergmann
2014-08-28 11:33:32 +02:00
parent 854bf7399a
commit 05ead076b4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compilerplugins/clang/compat.hxx
View File

@@ -151,7 +151,13 @@ inline unsigned getCustomDiagID(
inline std::unique_ptr<llvm::raw_fd_ostream> create_raw_fd_ostream( inline std::unique_ptr<llvm::raw_fd_ostream> create_raw_fd_ostream(
char const * Filename, std::string & ErrorInfo) 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<llvm::raw_fd_ostream> 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<llvm::raw_fd_ostream>( return std::unique_ptr<llvm::raw_fd_ostream>(
new llvm::raw_fd_ostream(Filename, ErrorInfo, llvm::sys::fs::F_None)); new llvm::raw_fd_ostream(Filename, ErrorInfo, llvm::sys::fs::F_None));
#else #else