diff options
| author | Yong He <yonghe@outlook.com> | 2017-11-04 20:07:47 -0400 |
|---|---|---|
| committer | Yong He <yonghe@outlook.com> | 2017-11-04 20:07:47 -0400 |
| commit | 6e4ba9bd552923b08cd56b4542b2f29e8df8ca0c (patch) | |
| tree | 4054db25f0a297bc7c22c41661e73e13b87cab08 | |
| parent | 87c15d35085b4bbec9ced8e170d027d58de4e6ef (diff) | |
naming cleanup
| -rw-r--r-- | source/slang/check.cpp | 4 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj | 3 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj.filters | 3 |
3 files changed, 2 insertions, 8 deletions
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 |