Fix redundant "typename typename T" in Visual Studio Native Visualizer

Also, a little minor cleanup

llvm-svn: 265338

diff --git a/clang/utils/ClangVisualizers/clang.natvis b/clang/utils/ClangVisualizers/clang.natvis
index 6e4bdf3..62ded3c 100644 (file)
--- a/clang/utils/ClangVisualizers/clang.natvis
+++ b/clang/utils/ClangVisualizers/clang.natvis
@@ -57,8 +57,8 @@ For later versions of Visual Studio, no setup is required-->
   <Type Name="clang::PointerType">\r
     <DisplayString>{PointeeType, view(poly)} *</DisplayString>\r
     <Expand>\r
-      <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
       <Item Name="PointeeType">PointeeType</Item>\r
+      <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
     </Expand>\r
   </Type>\r
   <!-- We visualize all inner types for clang reference types. So a rvalue reference to an lvalue reference\r
@@ -191,7 +191,8 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::TemplateTypeParmType">\r
-    <DisplayString>typename {*TTPDecl,view(cpp)}</DisplayString>\r
+    <DisplayString IncludeView="cpp">{*TTPDecl,view(cpp)}</DisplayString>\r
+    <DisplayString>{*TTPDecl}</DisplayString>\r
   </Type>\r
   <Type Name="clang::InjectedClassNameType">\r
     <DisplayString>{*Decl,view(cpp)}</DisplayString>\r