BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

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

Browse Source 
* 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
This commit is contained in:
Spencer Bench
2017-03-29 12:09:25 -06:00
committed by Wouter van Oortmerssen
parent a5cc2092a6
commit ccfa317486
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/idl_gen_general.cpp
View File

@@ -128,7 +128,7 @@ const LanguageParameters& GetLangParams(IDLOptions::Language lang) {
"__p.",
"Table.",
"?",
"using System;\nusing FlatBuffers;\n\n",
"using global::System;\nusing global::FlatBuffers;\n\n",
{
nullptr,
"///",

4
tests/MyGame/Example/Monster.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
/// an example documentation comment: monster object
public struct Monster : IFlatbufferObject

4
tests/MyGame/Example/Stat.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct Stat : IFlatbufferObject
{

4
tests/MyGame/Example/Test.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct Test : IFlatbufferObject
{

4
tests/MyGame/Example/TestSimpleTableWithEnum.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public partial struct TestSimpleTableWithEnum : IFlatbufferObject
{

4
tests/MyGame/Example/Vec3.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct Vec3 : IFlatbufferObject
{

4
tests/MyGame/Example2/Monster.cs
View File

@@ -3,8 +3,8 @@
namespace MyGame.Example2
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct Monster : IFlatbufferObject
{

4
tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
View File

@@ -3,8 +3,8 @@
namespace NamespaceA.NamespaceB
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct StructInNestedNS : IFlatbufferObject
{

4
tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
View File

@@ -3,8 +3,8 @@
namespace NamespaceA.NamespaceB
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct TableInNestedNS : IFlatbufferObject
{

4
tests/namespace_test/NamespaceA/SecondTableInA.cs
View File

@@ -3,8 +3,8 @@
namespace NamespaceA
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct SecondTableInA : IFlatbufferObject
{

4
tests/namespace_test/NamespaceA/TableInFirstNS.cs
View File

@@ -3,8 +3,8 @@
namespace NamespaceA
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct TableInFirstNS : IFlatbufferObject
{

4
tests/namespace_test/NamespaceC/TableInC.cs
View File

@@ -3,8 +3,8 @@
namespace NamespaceC
{
using System;
using FlatBuffers;
using global::System;
using global::FlatBuffers;
public struct TableInC : IFlatbufferObject
{