From 222cefa80a5ddb143d5cfabb7c15bce96089d3c0 Mon Sep 17 00:00:00 2001 From: Gil Pitney Date: Sat, 24 Jan 2015 01:44:24 +0000 Subject: LLVM 3.6: more handling of std::unique_ptr Passing a raw pointer to addRemappedFile(). Act->takeModule() returns a unique_ptr, so we need the raw pointer, taking it back by release() method. Signed-off-by: Gil Pitney --- src/core/compiler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/compiler.cpp b/src/core/compiler.cpp index eb121cb..47aeb9a 100644 --- a/src/core/compiler.cpp +++ b/src/core/compiler.cpp @@ -67,7 +67,7 @@ Compiler::~Compiler() } int Compiler::compile(const std::string &options, - llvm::MemoryBuffer *source) + llvm::MemoryBuffer *source) { /* Set options */ p_options = options; @@ -264,10 +264,10 @@ int Compiler::compile(const std::string &options, const llvm::StringRef s_data(source->getBuffer()); const llvm::StringRef s_name(""); - llvm::MemoryBuffer *buffer = + std::unique_ptr buffer = llvm::MemoryBuffer::getMemBuffer(s_data, s_name); - prep_opts.addRemappedFile("program.cl", buffer); + prep_opts.addRemappedFile("program.cl", buffer.get()); #endif //timespec t0, t1; @@ -287,7 +287,7 @@ int Compiler::compile(const std::string &options, //(float)t1.tv_sec-t0.tv_sec+(t1.tv_nsec-t0.tv_nsec)/1e9); p_log_stream.flush(); - p_module = Act->takeModule(); + p_module = Act->takeModule().release(); // uncomment to debug the llvm IR // p_module->dump(); -- cgit v1.2.3