skypjack hace 9 meses
padre
commit
87ec44d3ee
Se han modificado 2 ficheros con 6 adiciones y 7 borrados
  1. 0 1
      TODO
  2. 6 6
      natvis/entt/meta.natvis

+ 0 - 1
TODO

@@ -35,7 +35,6 @@ TODO:
 * meta non-const allow_cast overloads: (const int &) to (int &) is not allowed, but (const int &) to (double &) is allowed (support only for convertibles)
 * review build process for testbed (i.e. tests first due to SDL)
 * use any for meta_custom_node
-* support names directly on meta nodes
 * fwd meta_ctx (and update testbed)
 * avoid copying meta_type/data/func nodes
 * doc for labels on meta elements

+ 6 - 6
natvis/entt/meta.natvis

@@ -34,12 +34,12 @@
 		<Intrinsic Name="has_trait" Expression="!!(traits &amp; property)">
 			<Parameter Name="property" Type="int"/>
 		</Intrinsic>
-		<DisplayString Condition="label != nullptr">{{ id={ label,na } }}</DisplayString>
+		<DisplayString Condition="name != nullptr">{{ id={ name,na } }}</DisplayString>
 		<DisplayString Condition="get != nullptr">{{ id={ id } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<Item Name="[id]">id</Item>
-			<Item Name="[label]" Condition="label != nullptr">label,na</Item>
+			<Item Name="[name]" Condition="name != nullptr">name,na</Item>
 			<Item Name="[arity]">arity</Item>
 			<Item Name="[is_const]">has_trait(entt::internal::meta_traits::is_const)</Item>
 			<Item Name="[is_static]">has_trait(entt::internal::meta_traits::is_static)</Item>
@@ -54,12 +54,12 @@
 		<Intrinsic Name="has_trait" Expression="!!(traits &amp; property)">
 			<Parameter Name="property" Type="int"/>
 		</Intrinsic>
-		<DisplayString Condition="label != nullptr">{{ id={ label,na } }}</DisplayString>
+		<DisplayString Condition="name != nullptr">{{ id={ name,na } }}</DisplayString>
 		<DisplayString Condition="invoke != nullptr">{{ id={ id } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<Item Name="[id]">id</Item>
-			<Item Name="[label]" Condition="label != nullptr">label,na</Item>
+			<Item Name="[name]" Condition="name != nullptr">name,na</Item>
 			<Item Name="[arity]">arity</Item>
 			<Item Name="[is_const]">has_trait(entt::internal::meta_traits::is_const)</Item>
 			<Item Name="[is_static]">has_trait(entt::internal::meta_traits::is_static)</Item>
@@ -88,12 +88,12 @@
 		<Intrinsic Name="has_trait" Expression="!!(traits &amp; property)">
 			<Parameter Name="property" Type="int"/>
 		</Intrinsic>
-		<DisplayString Condition="label != nullptr">{{ type={ label,na } }}</DisplayString>
+		<DisplayString Condition="name != nullptr">{{ type={ name,na } }}</DisplayString>
 		<DisplayString Condition="info != nullptr">{{ type={ info->alias,na } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<Item Name="[id]">id</Item>
-			<Item Name="[label]" Condition="label != nullptr">label,na</Item>
+			<Item Name="[name]" Condition="name != nullptr">name,na</Item>
 			<Item Name="[sizeof]">size_of</Item>
 			<Item Name="[is_arithmetic]">has_trait(entt::internal::meta_traits::is_arithmetic)</Item>
 			<Item Name="[is_integral]">has_trait(entt::internal::meta_traits::is_integral)</Item>