diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-19 11:26:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 11:26:11 +0200 |
| commit | 394e6d5ee1479d402892d6df75dddceeb967efcc (patch) | |
| tree | 18f3f4aa277b3cc1c7da9638ca2ac11c3fb9781d /core/string_db.cpp | |
| parent | f4338266213868a5ed72c79edb9c080004c31f48 (diff) | |
| parent | 9a759750421bc72ed41c1dc67c0fa9b5564b8abc (diff) | |
Merge pull request #18281 from akien-mga/coverity-string
Fix some Coverity warnings in String API
Diffstat (limited to 'core/string_db.cpp')
| -rw-r--r-- | core/string_db.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/string_db.cpp b/core/string_db.cpp index 6e1f887754..2475cbe3e8 100644 --- a/core/string_db.cpp +++ b/core/string_db.cpp @@ -164,21 +164,14 @@ void StringName::operator=(const StringName &p_name) { _data = p_name._data; } } -/* was inlined -StringName::operator String() const { - if (_data) - return _data->get_name(); - - return ""; -} -*/ StringName::StringName(const StringName &p_name) { - ERR_FAIL_COND(!configured); _data = NULL; - if (p_name._data && p_name._data->refcount.ref()) { + ERR_FAIL_COND(!configured); + + if (p_name._data && p_name._data->refcount.ref()) { _data = p_name._data; } } |