Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/aspnet/MessagePack-CSharp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshifumi Kawai <ils@neue.cc>2020-01-17 11:40:01 +0300
committerGitHub <noreply@github.com>2020-01-17 11:40:01 +0300
commitee29e342931db6833a28ebbff157c8c608561fe7 (patch)
tree4a81c4d963f21b41808688224520d1c9e8271a13
parentdfd964c553151cb1d71593777ef738aa119e7688 (diff)
parent1ff351f13f57105d9c8da76cce37187f78553143 (diff)
Merge pull request #775 from neuecc/mpc-fix
Fix leaked use fullnamespace in mpc
-rw-r--r--src/MessagePack.GeneratorCore/Generator/FormatterTemplate.cs2
-rw-r--r--src/MessagePack.GeneratorCore/Generator/FormatterTemplate.tt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.cs b/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.cs
index 79879eea..6278191b 100644
--- a/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.cs
+++ b/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.cs
@@ -152,7 +152,7 @@ if(objInfo.HasIMessagePackSerializationCallbackReceiver && objInfo.NeedsCastOnBe
}
this.Write("\r\n for (int i = 0; i < length; i++)\r\n {\r\n");
if(objInfo.IsStringKey) {
- this.Write(@" ReadOnlySpan<byte> stringKey = Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+ this.Write(@" ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
int key;
if (!this.____keyMapping.TryGetValue(stringKey, out key))
{
diff --git a/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.tt b/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.tt
index dece3e73..f436a4d2 100644
--- a/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.tt
+++ b/src/MessagePack.GeneratorCore/Generator/FormatterTemplate.tt
@@ -115,7 +115,7 @@ namespace <#= Namespace #>
for (int i = 0; i < length; i++)
{
<# if(objInfo.IsStringKey) { #>
- ReadOnlySpan<byte> stringKey = Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+ ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
int key;
if (!this.____keyMapping.TryGetValue(stringKey, out key))
{