diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2019-01-22 19:01:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 19:01:52 +0100 |
| commit | 6a187f639511726583db05f8cd80957b1f936d03 (patch) | |
| tree | cb2c7522958eeb35745b8a67126c9045ab23cdc4 /modules/mono/csharp_script.h | |
| parent | cd45f05f7e930869fb8d58c62e5f866470b73e1a (diff) | |
| parent | bc8b61bb069a9229dbceb61fedb8308c5d1e6a68 (diff) | |
Merge pull request #25235 from neikeq/pp
Mono: Fix hot reload build errors and cleanup
Diffstat (limited to 'modules/mono/csharp_script.h')
| -rw-r--r-- | modules/mono/csharp_script.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index e554e1f41f..8a09be79a6 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -82,10 +82,7 @@ class CSharpScript : public Script { Set<Object *> instances; -#ifdef DEBUG_ENABLED - Set<ObjectID> pending_reload_instances; -#endif - +#ifdef GD_MONO_HOT_RELOAD struct StateBackup { // TODO // Replace with buffer containing the serialized state of managed scripts. @@ -93,8 +90,8 @@ class CSharpScript : public Script { List<Pair<StringName, Variant> > properties; }; -#ifdef TOOLS_ENABLED - Map<ObjectID, CSharpScript::StateBackup> pending_reload_state; + Set<ObjectID> pending_reload_instances; + Map<ObjectID, StateBackup> pending_reload_state; #endif String source; @@ -313,7 +310,7 @@ public: bool debug_break(const String &p_error, bool p_allow_continue = true); bool debug_break_parse(const String &p_file, int p_line, const String &p_error); -#ifdef TOOLS_ENABLED +#ifdef GD_MONO_HOT_RELOAD bool is_assembly_reloading_needed(); void reload_assemblies(bool p_soft_reload); #endif |