summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-05-19 03:55:49 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-05-19 03:55:49 +0000
commite653622b98aa31cdb183e1fd80f2b5b1d4f22bd1 (patch)
treed68ec4108778d1c53a81d8ab9f4a2bec65465fd7
parentb816593cf0c42bc1b47a5a838b48cc1e0e3d9d63 (diff)
downloadbcm5719-llvm-e653622b98aa31cdb183e1fd80f2b5b1d4f22bd1.tar.gz
bcm5719-llvm-e653622b98aa31cdb183e1fd80f2b5b1d4f22bd1.zip
polly: update for LLVM API change
SVN r209103 removed the OwningPtr variant of the MemoryBuffer APIs. Switch to the equivalent std::unique_ptr versions. This should clear up the build bots. llvm-svn: 209104
-rw-r--r--polly/lib/Exchange/JSONExporter.cpp4
-rw-r--r--polly/lib/Transform/Pocc.cpp7
2 files changed, 6 insertions, 5 deletions
diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index 07ed53dabc3..08be3a26a31 100644
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -16,7 +16,6 @@
#include "polly/Options.h"
#include "polly/ScopInfo.h"
#include "polly/ScopPass.h"
-#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -31,6 +30,7 @@
#include "isl/constraint.h"
#include "isl/printer.h"
+#include <memory>
#include <string>
using namespace llvm;
@@ -193,7 +193,7 @@ bool JSONImporter::runOnScop(Scop &scop) {
std::string FunctionName = R.getEntry()->getParent()->getName();
errs() << "Reading JScop '" << R.getNameStr() << "' in function '"
<< FunctionName << "' from '" << FileName << "'.\n";
- OwningPtr<MemoryBuffer> result;
+ std::unique_ptr<MemoryBuffer> result;
error_code ec = MemoryBuffer::getFile(FileName, result);
if (ec) {
diff --git a/polly/lib/Transform/Pocc.cpp b/polly/lib/Transform/Pocc.cpp
index 8002b7655e1..73d991c7e28 100644
--- a/polly/lib/Transform/Pocc.cpp
+++ b/polly/lib/Transform/Pocc.cpp
@@ -30,13 +30,14 @@
#include "llvm/Support/Program.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/system_error.h"
-#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include "isl/space.h"
#include "isl/map.h"
#include "isl/constraint.h"
+#include <memory>
+
using namespace llvm;
using namespace polly;
@@ -239,8 +240,8 @@ bool Pocc::runOnScop(Scop &S) {
}
void Pocc::printScop(raw_ostream &OS) const {
- OwningPtr<MemoryBuffer> stdoutBuffer;
- OwningPtr<MemoryBuffer> stderrBuffer;
+ std::unique_ptr<MemoryBuffer> stdoutBuffer;
+ std::unique_ptr<MemoryBuffer> stderrBuffer;
OS << "Command line: ";
OpenPOWER on IntegriCloud