diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 14:50:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 14:50:17 +0200 |
| commit | 15b25b739dab84dcde99deaf29e75547ec941f45 (patch) | |
| tree | 90aa672d8623d299282bf6f2bbb7216f6738cdf3 /modules/mono | |
| parent | 5f5f53e8eba5c9b708714de58d3cca6ceb010279 (diff) | |
| parent | a1aaed5a84e5206032495ee3d7447847aa8c9515 (diff) | |
Merge pull request #38736 from akien-mga/modernize-all-the-things
C++: Apply some `modernize-*` checks from clang-tidy (nullptr, bool literals, void args)
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_export.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 7d00d2d314..43c86d3e28 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -295,7 +295,7 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const { "when", "where", "yield", - 0 + nullptr }; const char **w = _reserved_words; diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp index d6a271f1d9..1cdb08d50e 100644 --- a/modules/mono/editor/godotsharp_export.cpp +++ b/modules/mono/editor/godotsharp_export.cpp @@ -78,7 +78,7 @@ Error get_assembly_dependencies(GDMonoAssembly *p_assembly, const Vector<String> if (r_assembly_dependencies.has(ref_name)) continue; - GDMonoAssembly *ref_assembly = NULL; + GDMonoAssembly *ref_assembly = nullptr; { MonoAssemblyName *ref_aname = mono_assembly_name_new("A"); // We can't allocate an empty MonoAssemblyName, hence "A" |