commit a18cc9c60a032e4a02ea0aef08bc758e5acb4cd0
author Jim Stichnoth <stichnot@chromium.org> Tue Sep 30 19:10:22 2014 -0700
committer Jim Stichnoth <stichnot@chromium.org> Tue Sep 30 19:10:22 2014 -0700
tree 8196678dfe796a123c3f5af2c70962b675839ffb
parent c4554d784583d26a02eca8610b43511ade516082

Subzero: Change llvm::OwningPtr to C++11's std::unique_ptr.

While I'm at it, normalize the #include order:

1. C++ library headers
2. LLVM headers
3. Subzero headers

A blank line between each group.  Each group sorted alphabetically, case-insensitive.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=3930
R=jfb@chromium.org, jvoung@chromium.org

Review URL: https://codereview.chromium.org/622443002

src/IceCfg.h

diff --git a/src/IceCfg.h b/src/IceCfg.h
index 1de7795..5a4c4a1 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 @@
   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