Fix Visual Studio compilation of types within template classes.

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

Fix Visual Studio compilation of types within template classes.
d7396149 · Nicolas Capens · Nicolas Capens · dbd600d6 · d7396149 · d7396149
Commit d7396149 authored Sep 02, 2016 by Nicolas Capens Committed by Nicolas Capens Sep 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

IceInstX86Base.h src/IceInstX86Base.h +1 -1

IceInstX86BaseImpl.h src/IceInstX86BaseImpl.h +2 -2

No files found.
--- 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;
  };

--- 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>