diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-02 14:52:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 14:52:36 +0200 |
| commit | 058a0afdeca83145d58a95c426dd01216c397ea9 (patch) | |
| tree | be0cd59e5a90926e9d653fed9f3b1b77e735ca2f /main/tests/test_shader_lang.cpp | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
| parent | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (diff) | |
| download | redot-engine-058a0afdeca83145d58a95c426dd01216c397ea9.tar.gz | |
Merge pull request #37338 from lupoDharkael/nullprt
Replace NULL with nullptr
Diffstat (limited to 'main/tests/test_shader_lang.cpp')
| -rw-r--r-- | main/tests/test_shader_lang.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index dd525d7653..1e85f7f1d2 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -310,7 +310,7 @@ MainLoop *test() { if (cmdlargs.empty()) { //try editor! print_line("usage: godot -test shader_lang <shader>"); - return NULL; + return nullptr; } String test = cmdlargs.back()->get(); @@ -318,7 +318,7 @@ MainLoop *test() { FileAccess *fa = FileAccess::open(test, FileAccess::READ); if (!fa) { - ERR_FAIL_V(NULL); + ERR_FAIL_V(nullptr); } String code; @@ -347,13 +347,13 @@ MainLoop *test() { if (err) { print_line("Error at line: " + rtos(sl.get_error_line()) + ": " + sl.get_error_text()); - return NULL; + return nullptr; } else { String code2; recreate_code(&code2, sl.get_shader()); print_line("code:\n\n" + code2); } - return NULL; + return nullptr; } } // namespace TestShaderLang |