Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: src/IceCfg.h

Issue 622443002: Subzero: Change llvm::OwningPtr to C++11's std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Remove ErrorOr for now Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/IceCfg.cpp » ('j') | src/PNaClTranslator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceCfg.h
diff --git a/src/IceCfg.h b/src/IceCfg.h
index 1de77956951b741e19b4e68803327307257960a2..5a4c4a161a69c46c8b592caf53e269b080e01b56 100644
--- a/src/IceCfg.h
+++ b/src/IceCfg.h
@@ -15,15 +15,15 @@
#ifndef SUBZERO_SRC_ICECFG_H
#define SUBZERO_SRC_ICECFG_H
-#include "IceDefs.h"
-#include "IceTypes.h"
+#include <memory>
+
+#include "llvm/Support/Allocator.h"
#include "assembler.h"
#include "IceClFlags.h"
+#include "IceDefs.h"
#include "IceGlobalContext.h"
-
-#include "llvm/ADT/OwningPtr.h"
-#include "llvm/Support/Allocator.h"
+#include "IceTypes.h"
namespace Ice {
@@ -172,10 +172,10 @@ private:
VarList Variables;
VarList Args; // subset of Variables, in argument order
VarList ImplicitArgs; // subset of Variables
- llvm::OwningPtr<Liveness> Live;
- llvm::OwningPtr<TargetLowering> Target;
- llvm::OwningPtr<VariablesMetadata> VMetadata;
- llvm::OwningPtr<Assembler> TargetAssembler;
+ std::unique_ptr<Liveness> Live;
+ std::unique_ptr<TargetLowering> Target;
+ std::unique_ptr<VariablesMetadata> VMetadata;
+ std::unique_ptr<Assembler> TargetAssembler;
// CurrentNode is maintained during dumping/emitting just for
// validating Variable::DefNode. Normally, a traversal over
« no previous file with comments | « no previous file | src/IceCfg.cpp » ('j') | src/PNaClTranslator.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698