Browse Source

Merge pull request #308 from ddobrev/master

Removed a needless renaming of parameters
pull/309/head
João Matos 12 years ago
parent
commit
576b06a8a5
  1. 2
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  2. 4
      tests/Basic/Basic.cpp
  3. 1
      tests/Basic/Basic.h

2
src/Generator/Generators/CSharp/CSharpMarshal.cs

@ -495,7 +495,7 @@ namespace CppSharp.Generators.CSharp
Context.Return.Write("&_{0}", param.Name); Context.Return.Write("&_{0}", param.Name);
} }
else else
Context.Return.Write(Helpers.SafeIdentifier(Context.Parameter.Name)); Context.Return.Write(Context.Parameter.Name);
return true; return true;
} }

4
tests/Basic/Basic.cpp

@ -36,6 +36,10 @@ char Foo2::testCharMarshalling(char c)
return c; return c;
} }
void Foo2::testKeywordParam(void* where)
{
}
Bar::Bar() Bar::Bar()
{ {
} }

1
tests/Basic/Basic.h

@ -51,6 +51,7 @@ public:
Foo2 operator<<(signed long l); Foo2 operator<<(signed long l);
Bar valueTypeField; Bar valueTypeField;
char testCharMarshalling(char c); char testCharMarshalling(char c);
void testKeywordParam(void* where);
}; };
DLL_API Bar::Item operator |(Bar::Item left, Bar::Item right); DLL_API Bar::Item operator |(Bar::Item left, Bar::Item right);

Loading…
Cancel
Save