From 7b510bec4221714bd8095b094b454abae732a710 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Fri, 9 Sep 2016 19:48:06 +0300 Subject: [PATCH] Simplified the name of the internal structure. Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CSharp/CSharpSources.cs | 2 +- tests/CSharp/CSharp.Tests.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs index 4e19ae4e..66c6a4e9 100644 --- a/src/Generator/Generators/CSharp/CSharpSources.cs +++ b/src/Generator/Generators/CSharp/CSharpSources.cs @@ -40,7 +40,7 @@ namespace CppSharp.Generators.CSharp return new string(id.Select(c => char.IsLetterOrDigit(c) ? c : '_').ToArray()); } - public static readonly string InternalStruct = Generator.GeneratedIdentifier("_Internal"); + public static readonly string InternalStruct = Generator.GeneratedIdentifier("Internal"); public static readonly string InstanceField = Generator.GeneratedIdentifier("instance"); public static readonly string InstanceIdentifier = Generator.GeneratedIdentifier("Instance"); public static readonly string PointerAdjustmentIdentifier = Generator.GeneratedIdentifier("PointerAdjustment"); diff --git a/tests/CSharp/CSharp.Tests.cs b/tests/CSharp/CSharp.Tests.cs index 9007b10d..a0f34e9d 100644 --- a/tests/CSharp/CSharp.Tests.cs +++ b/tests/CSharp/CSharp.Tests.cs @@ -436,7 +436,7 @@ public unsafe class CSharpTests : GeneratorTestFixture [Test] public unsafe void TestSizeOfDerivesFromTemplateInstantiation() { - Assert.That(sizeof(DerivesFromTemplateInstantiation.___Internal), Is.EqualTo(sizeof(int))); + Assert.That(sizeof(DerivesFromTemplateInstantiation.__Internal), Is.EqualTo(sizeof(int))); } [Test] @@ -526,12 +526,12 @@ public unsafe class CSharpTests : GeneratorTestFixture { foreach (var internalType in new[] { - typeof(CSharp.IndependentFields.___Internal), - typeof(CSharp.DependentValueFields.___Internalc__S_DependentValueFields__b), + typeof(CSharp.IndependentFields.__Internal), + typeof(CSharp.DependentValueFields.__Internalc__S_DependentValueFields__b), //typeof(CSharp.DependentValueFields.Internal_float), - typeof(CSharp.DependentPointerFields.___Internal), + typeof(CSharp.DependentPointerFields.__Internal), //typeof(CSharp.DependentValueFields.Internal_Ptr), - typeof(CSharp.HasDefaultTemplateArgument.___Internalc__S_HasDefaultTemplateArgument__I___S_IndependentFields__I) + typeof(CSharp.HasDefaultTemplateArgument.__Internalc__S_HasDefaultTemplateArgument__I___S_IndependentFields__I) }) { var independentFields = internalType.GetFields();