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 /core/os/dir_access.h | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
| parent | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (diff) | |
Merge pull request #37338 from lupoDharkael/nullprt
Replace NULL with nullptr
Diffstat (limited to 'core/os/dir_access.h')
| -rw-r--r-- | core/os/dir_access.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 059f7aad2f..60eb553968 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -128,7 +128,7 @@ public: create_func[p_access] = _create_builtin<T>; } - static DirAccess *open(const String &p_path, Error *r_error = NULL); + static DirAccess *open(const String &p_path, Error *r_error = nullptr); DirAccess(); virtual ~DirAccess(); @@ -141,7 +141,7 @@ struct DirAccessRef { return f; } - operator bool() const { return f != NULL; } + operator bool() const { return f != nullptr; } DirAccess *f; DirAccessRef(DirAccess *fa) { f = fa; } ~DirAccessRef() { |