aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGil Pitney <gil.pitney@linaro.org>2015-01-24 01:44:24 +0000
committerGil Pitney <gil.pitney@linaro.org>2015-01-24 01:44:24 +0000
commit222cefa80a5ddb143d5cfabb7c15bce96089d3c0 (patch)
tree2133834f0c8574b7bf30c878b640f019550bd634
parent7094a9f2ccca0494de3568c8abeda1b5e5f8bbb5 (diff)
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 <gil.pitney@linaro.org>
-rw-r--r--src/core/compiler.cpp8
1 files 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("<source>");
- llvm::MemoryBuffer *buffer =
+ std::unique_ptr<llvm::MemoryBuffer> 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();