Subzero: Fix a build error. Also reformat.

BUG= none
TBR=nicolascapens@chromium.org

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

diff --git a/src/IceInstX86BaseImpl.h b/src/IceInstX86BaseImpl.h
index 0187f9b..26fa2c4 100644 (file)
--- a/src/IceInstX86BaseImpl.h
+++ b/src/IceInstX86BaseImpl.h
@@ -105,10 +105,10 @@ InstImpl<TraitsType>::InstX86Label::InstX86Label(Cfg *Func,
 }
 
 template <typename TraitsType>
-InstImpl<TraitsType>::InstX86Br::InstX86Br(
-    Cfg *Func, const CfgNode *TargetTrue, const CfgNode *TargetFalse,
-    const InstX86Label *Label, BrCond Condition,
-    Mode Kind)
+InstImpl<TraitsType>::InstX86Br::InstX86Br(Cfg *Func, const CfgNode *TargetTrue,
+                                           const CfgNode *TargetFalse,
+                                           const InstX86Label *Label,
+                                           BrCond Condition, Mode Kind)
     : InstX86Base(Func, InstX86Base::Br, 0, nullptr), Condition(Condition),
       TargetTrue(TargetTrue), TargetFalse(TargetFalse), Label(Label),
       Kind(Kind) {}
@@ -305,8 +305,7 @@ InstImpl<TraitsType>::InstX86StoreQ::InstX86StoreQ(Cfg *Func, Variable *Value,
 }
 
 template <typename TraitsType>
-InstImpl<TraitsType>::InstX86Nop::InstX86Nop(Cfg *Func,
-                                             NopVariant Variant)
+InstImpl<TraitsType>::InstX86Nop::InstX86Nop(Cfg *Func, NopVariant Variant)
     : InstX86Base(Func, InstX86Base::Nop, 0, nullptr), Variant(Variant) {}
 
 template <typename TraitsType>

diff --git a/src/IceMemory.cpp b/src/IceMemory.cpp
index 0026661..ce1ff6a 100644 (file)
--- a/src/IceMemory.cpp
+++ b/src/IceMemory.cpp
@@ -38,7 +38,7 @@ void CfgAllocatorTraits::set_current(ArenaAllocator *Allocator) {
   ICE_TLS_SET_FIELD(CfgAllocator, Allocator);
 }
 
-void CfgAllocatorTraits::set_current(nullptr_t) {
+void CfgAllocatorTraits::set_current(std::nullptr_t) {
   ICE_TLS_SET_FIELD(CfgAllocator, nullptr);
 }
 

diff --git a/src/IceMemory.h b/src/IceMemory.h
index 366c49d..b651d0a 100644 (file)
--- a/src/IceMemory.h
+++ b/src/IceMemory.h
@@ -144,7 +144,7 @@ public:
   static allocator_type current();
   static void set_current(const manager_type *Manager);
   static void set_current(ArenaAllocator *Allocator);
-  static void set_current(nullptr_t);
+  static void set_current(std::nullptr_t);
 
 private:
   ICE_TLS_DECLARE_FIELD(ArenaAllocator *, CfgAllocator);