From 36481c30b324a3528eb2995543ab5b8272eed2a0 Mon Sep 17 00:00:00 2001
From: ioannis-e <ioannis-e@users.noreply.github.com>
Date: Mon, 30 Mar 2020 05:22:52 +0300
Subject: [PATCH] Update Visual Studio Visualizer (#1665)

1. Determine the correct type of string based on encoding
2. Omit string pointer address
---
 contrib/natvis/rapidjson.natvis | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/natvis/rapidjson.natvis b/contrib/natvis/rapidjson.natvis
index a804b7bf6..e7bd44b6e 100644
--- a/contrib/natvis/rapidjson.natvis
+++ b/contrib/natvis/rapidjson.natvis
@@ -5,8 +5,8 @@
 		<DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kNullType">null</DisplayString>
 		<DisplayString Condition="data_.f.flags == kTrueFlag">true</DisplayString>
 		<DisplayString Condition="data_.f.flags == kFalseFlag">false</DisplayString>
-		<DisplayString Condition="data_.f.flags == kShortStringFlag">{data_.ss.str}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kStringType">{(const char*)((size_t)data_.s.str &amp; 0x0000FFFFFFFFFFFF)}</DisplayString>
+		<DisplayString Condition="data_.f.flags == kShortStringFlag">{(const Ch*)data_.ss.str,na}</DisplayString>
+		<DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kStringType">{(const Ch*)((size_t)data_.s.str &amp; 0x0000FFFFFFFFFFFF),na}</DisplayString>
 		<DisplayString Condition="(data_.f.flags &amp; kNumberIntFlag) == kNumberIntFlag">{data_.n.i.i}</DisplayString>
 		<DisplayString Condition="(data_.f.flags &amp; kNumberUintFlag) == kNumberUintFlag">{data_.n.u.u}</DisplayString>
 		<DisplayString Condition="(data_.f.flags &amp; kNumberInt64Flag) == kNumberInt64Flag">{data_.n.i64}</DisplayString>