godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22769 from neikeq/issue-22765 

Fix C# API assembly build errors in generics
This commit is contained in:
Rémi Verschelde 2018-10-05 20:04:37 +02:00 committed by GitHub
parent 46a751c638 b5aa5bca12
commit f5a77f7bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/glue/Managed/Files/Extensions/NodeExtensions.cs
View File

@ -4,7 +4,7 @@ namespace Godot
{ {
public T GetNode<T>(NodePath path) where T : class public T GetNode<T>(NodePath path) where T : class
{ {
return (T)GetNode(path); return (T)(object)GetNode(path);
} }
public T GetNodeOrNull<T>(NodePath path) where T : class public T GetNodeOrNull<T>(NodePath path) where T : class
@ -14,7 +14,7 @@ namespace Godot
public T GetChild<T>(int idx) where T : class public T GetChild<T>(int idx) where T : class
{ {
return (T)GetChild(idx); return (T)(object)GetChild(idx);
} }
public T GetChildOrNull<T>(int idx) where T : class public T GetChildOrNull<T>(int idx) where T : class
@ -24,7 +24,7 @@ namespace Godot
public T GetOwner<T>() where T : class public T GetOwner<T>() where T : class
{ {
return (T)GetOwner(); return (T)(object)GetOwner();
} }
public T GetOwnerOrNull<T>() where T : class public T GetOwnerOrNull<T>() where T : class
@ -34,7 +34,7 @@ namespace Godot
public T GetParent<T>() where T : class public T GetParent<T>() where T : class
{ {
return (T)GetParent(); return (T)(object)GetParent();
} }
public T GetParentOrNull<T>() where T : class public T GetParentOrNull<T>() where T : class

4
modules/mono/glue/Managed/Files/Extensions/ResourceLoaderExtensions.cs
View File

@ -2,9 +2,9 @@ namespace Godot
{ {
public static partial class ResourceLoader public static partial class ResourceLoader
{ {
public static T Load<T>(string path) where T : Godot.Resource public static T Load<T>(string path) where T : class
{ {
return (T) Load(path); return (T)(object)Load(path);
} }
} }
} }

2
modules/mono/glue/Managed/Files/GD.cs
View File

@ -67,7 +67,7 @@ namespace Godot
public static T Load<T>(string path) where T : class public static T Load<T>(string path) where T : class
{ {
return (T) ResourceLoader.Load(path); return ResourceLoader.Load<T>(path);
} }
public static void Print(params object[] what) public static void Print(params object[] what)