Commit ccfa3174 authored by Spencer Bench's avatar Spencer Bench Committed by Wouter van Oortmerssen

C#: Fixed possible conflicts between usings and user-supplied namespace (#4247)

* C#: Fixed possible conflicts between usings and user-supplied namespace

C#: Added the global qualifier to using directives to prevent possible conflicts with the user-supplied namespace. Also prevents unintentional type hiding. Resolves issue #4242.

* Updated C# generated code files
parent a5cc2092
...@@ -128,7 +128,7 @@ const LanguageParameters& GetLangParams(IDLOptions::Language lang) { ...@@ -128,7 +128,7 @@ const LanguageParameters& GetLangParams(IDLOptions::Language lang) {
"__p.", "__p.",
"Table.", "Table.",
"?", "?",
"using System;\nusing FlatBuffers;\n\n", "using global::System;\nusing global::FlatBuffers;\n\n",
{ {
nullptr, nullptr,
"///", "///",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example namespace MyGame.Example
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
/// an example documentation comment: monster object /// an example documentation comment: monster object
public struct Monster : IFlatbufferObject public struct Monster : IFlatbufferObject
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example namespace MyGame.Example
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct Stat : IFlatbufferObject public struct Stat : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example namespace MyGame.Example
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct Test : IFlatbufferObject public struct Test : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example namespace MyGame.Example
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public partial struct TestSimpleTableWithEnum : IFlatbufferObject public partial struct TestSimpleTableWithEnum : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example namespace MyGame.Example
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct Vec3 : IFlatbufferObject public struct Vec3 : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace MyGame.Example2 namespace MyGame.Example2
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct Monster : IFlatbufferObject public struct Monster : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace NamespaceA.NamespaceB namespace NamespaceA.NamespaceB
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct StructInNestedNS : IFlatbufferObject public struct StructInNestedNS : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace NamespaceA.NamespaceB namespace NamespaceA.NamespaceB
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct TableInNestedNS : IFlatbufferObject public struct TableInNestedNS : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace NamespaceA namespace NamespaceA
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct SecondTableInA : IFlatbufferObject public struct SecondTableInA : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace NamespaceA namespace NamespaceA
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct TableInFirstNS : IFlatbufferObject public struct TableInFirstNS : IFlatbufferObject
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace NamespaceC namespace NamespaceC
{ {
using System; using global::System;
using FlatBuffers; using global::FlatBuffers;
public struct TableInC : IFlatbufferObject public struct TableInC : IFlatbufferObject
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment