From: Nicolas Capens <capn@google.com>
Date: Fri, 2 Sep 2016 14:22:57 +0000 (-0400)
Subject: Fix Visual Studio compilation of types within template classes.
X-Git-Tag: android-x86-7.1-r1~148^2~127
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d7396149706211af10d08abceb3506ec9892d1dd;p=android-x86%2Fexternal-swiftshader.git

Fix Visual Studio compilation of types within template classes.

BUG=swiftshader:7

Change-Id: I0c51c67b6f19a061dfff83415df5e41ea0efd6de
Reviewed-on: https://chromium-review.googlesource.com/380596
Reviewed-by: Jim Stichnoth <stichnot@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@google.com>
---

diff --git a/src/IceInstX86Base.h b/src/IceInstX86Base.h
index 12213511a..2ed35fe31 100644
--- a/src/IceInstX86Base.h
+++ b/src/IceInstX86Base.h
@@ -2632,7 +2632,7 @@ template <typename TraitsType> struct InstImpl {
     }
 
   private:
-    InstX86Nop(Cfg *Func, SizeT Length);
+    InstX86Nop(Cfg *Func, NopVariant Length);
 
     NopVariant Variant;
   };
diff --git a/src/IceInstX86BaseImpl.h b/src/IceInstX86BaseImpl.h
index 4b9ea413a..0187f9b03 100644
--- a/src/IceInstX86BaseImpl.h
+++ b/src/IceInstX86BaseImpl.h
@@ -107,7 +107,7 @@ InstImpl<TraitsType>::InstX86Label::InstX86Label(Cfg *Func,
 template <typename TraitsType>
 InstImpl<TraitsType>::InstX86Br::InstX86Br(
     Cfg *Func, const CfgNode *TargetTrue, const CfgNode *TargetFalse,
-    const InstImpl<TraitsType>::InstX86Label *Label, BrCond Condition,
+    const InstX86Label *Label, BrCond Condition,
     Mode Kind)
     : InstX86Base(Func, InstX86Base::Br, 0, nullptr), Condition(Condition),
       TargetTrue(TargetTrue), TargetFalse(TargetFalse), Label(Label),
@@ -306,7 +306,7 @@ InstImpl<TraitsType>::InstX86StoreQ::InstX86StoreQ(Cfg *Func, Variable *Value,
 
 template <typename TraitsType>
 InstImpl<TraitsType>::InstX86Nop::InstX86Nop(Cfg *Func,
-                                             InstX86Nop::NopVariant Variant)
+                                             NopVariant Variant)
     : InstX86Base(Func, InstX86Base::Nop, 0, nullptr), Variant(Variant) {}
 
 template <typename TraitsType>