From 6e4ba9bd552923b08cd56b4542b2f29e8df8ca0c Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Sat, 4 Nov 2017 20:07:47 -0400
Subject: naming cleanup

---
 source/slang/check.cpp             | 4 ++--
 source/slang/slang.vcxproj         | 3 ---
 source/slang/slang.vcxproj.filters | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/slang/check.cpp b/source/slang/check.cpp
index 58c1762bb..bc3823292 100644
--- a/source/slang/check.cpp
+++ b/source/slang/check.cpp
@@ -1638,10 +1638,10 @@ namespace Slang
             {
                 // this is a sub type (e.g. nested struct declaration) in an aggregate type
                 // check if this sub type declaration satisfies the constraints defined by the associated type
-                if (auto requiredTypeDecl = requiredMemberDeclRef.As<AssocTypeDecl>())
+                if (auto requiredTypeDeclRef = requiredMemberDeclRef.As<AssocTypeDecl>())
                 {
                     bool conformance = true;
-                    for (auto & inheritanceDecl : requiredTypeDecl.getDecl()->getMembersOfType<InheritanceDecl>())
+                    for (auto & inheritanceDecl : requiredTypeDeclRef.getDecl()->getMembersOfType<InheritanceDecl>())
                     {
                         conformance = conformance && checkConformance(subStructTypeDecl, inheritanceDecl.Ptr());
                     }
diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj
index 15fde5673..b09eae3ab 100644
--- a/source/slang/slang.vcxproj
+++ b/source/slang/slang.vcxproj
@@ -296,9 +296,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)slang-generate.exe</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="slang.natstepfilter" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters
index 011199af4..ef9b3c8e5 100644
--- a/source/slang/slang.vcxproj.filters
+++ b/source/slang/slang.vcxproj.filters
@@ -77,7 +77,4 @@
     <CustomBuild Include="glsl.meta.slang" />
     <CustomBuild Include="hlsl.meta.slang" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="slang.natstepfilter" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3