diff options
author | Jeroen Ketema <j.ketema@imperial.ac.uk> | 2014-06-21 09:20:31 +0000 |
---|---|---|
committer | Jeroen Ketema <j.ketema@imperial.ac.uk> | 2014-06-21 09:20:31 +0000 |
commit | d253e66ec7eaabd5171dc9ba79da78f62156df42 (patch) | |
tree | 5e649eba83df31b2990a563a6ce436f622bab72d /libclc | |
parent | fa3016839528e459016aa624121429b240004a8f (diff) | |
download | bcm5719-llvm-d253e66ec7eaabd5171dc9ba79da78f62156df42.tar.gz bcm5719-llvm-d253e66ec7eaabd5171dc9ba79da78f62156df42.zip |
Fix breakage after r211259
While we are here introduce the proper headers for the error code.
Reviewed-by: Tom Stellard <tom@stellard.net>
llvm-svn: 211432
Diffstat (limited to 'libclc')
-rw-r--r-- | libclc/utils/prepare-builtins.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libclc/utils/prepare-builtins.cpp b/libclc/utils/prepare-builtins.cpp index c7f013f901e..20890edbfcc 100644 --- a/libclc/utils/prepare-builtins.cpp +++ b/libclc/utils/prepare-builtins.cpp @@ -1,4 +1,3 @@ -#include "llvm/ADT/OwningPtr.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/IR/Function.h" #include "llvm/IR/GlobalVariable.h" @@ -13,17 +12,24 @@ #include "llvm/Support/ToolOutputFile.h" #include "llvm/Config/config.h" -using namespace llvm; - #define LLVM_350_AND_NEWER \ (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5)) #if LLVM_350_AND_NEWER +#include <system_error> + #define ERROR_CODE std::error_code +#define UNIQUE_PTR std::unique_ptr #else +#include "llvm/ADT/OwningPtr.h" +#include "llvm/Support/system_error.h" + #define ERROR_CODE error_code +#define UNIQUE_PTR OwningPtr #endif +using namespace llvm; + static cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-")); @@ -41,11 +47,7 @@ int main(int argc, char **argv) { std::auto_ptr<Module> M; { -#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) - std::unique_ptr<MemoryBuffer> BufferPtr; -#else - OwningPtr<MemoryBuffer> BufferPtr; -#endif + UNIQUE_PTR<MemoryBuffer> BufferPtr; if (ERROR_CODE ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr)) ErrorMessage = ec.message(); else { @@ -87,7 +89,7 @@ int main(int argc, char **argv) { } std::string ErrorInfo; - OwningPtr<tool_output_file> Out + UNIQUE_PTR<tool_output_file> Out (new tool_output_file(OutputFilename.c_str(), ErrorInfo, #if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 4) sys::fs::F_Binary)); |