diff options
| author | Marcelo Fernandez | 2018-03-22 00:17:18 -0300 |
|---|---|---|
| committer | Marcelo Fernandez | 2018-03-22 00:17:18 -0300 |
| commit | 35d21c08813242002e31f1d9bbc45fed5a21ebde (patch) | |
| tree | 60bce83ab5f359d83ee2537977c306d1ba7eba2b /core | |
| parent | f2df8c94b2e5ba6c4eee3515d1d30f36194ca803 (diff) | |
| download | godot-35d21c08813242002e31f1d9bbc45fed5a21ebde.tar.gz godot-35d21c08813242002e31f1d9bbc45fed5a21ebde.tar.zst godot-35d21c08813242002e31f1d9bbc45fed5a21ebde.zip | |
Diffstat (limited to 'core')
| -rw-r--r-- | core/command_queue_mt.cpp | 1 | ||||
| -rw-r--r-- | core/command_queue_mt.h | 6 | ||||
| -rw-r--r-- | core/reference.h | 5 | ||||
| -rw-r--r-- | core/string_buffer.h | 6 | ||||
| -rw-r--r-- | core/string_builder.h | 6 |
5 files changed, 16 insertions, 8 deletions
diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp index 6bb313575..a39c920df 100644 --- a/core/command_queue_mt.cpp +++ b/core/command_queue_mt.cpp @@ -105,6 +105,7 @@ CommandQueueMT::CommandQueueMT(bool p_sync) { read_ptr = 0; write_ptr = 0; + dealloc_ptr = 0; mutex = Mutex::create(); for (int i = 0; i < SYNC_SEMAPHORES; i++) { diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index c1439bdc4..3942b961d 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -309,9 +309,9 @@ class CommandQueueMT { }; uint8_t command_mem[COMMAND_MEM_SIZE]; - uint32_t read_ptr = 0; - uint32_t write_ptr = 0; - uint32_t dealloc_ptr = 0; + uint32_t read_ptr; + uint32_t write_ptr; + uint32_t dealloc_ptr; SyncSemaphore sync_sems[SYNC_SEMAPHORES]; Mutex *mutex; Semaphore *sync; diff --git a/core/reference.h b/core/reference.h index a0bdb6225..0d6b1ced6 100644 --- a/core/reference.h +++ b/core/reference.h @@ -63,7 +63,7 @@ public: template <class T> class Ref { - T *reference = NULL; + T *reference; void ref(const Ref &p_from) { @@ -213,10 +213,9 @@ public: Ref(T *p_reference) { + reference = NULL; if (p_reference) ref_pointer(p_reference); - else - reference = NULL; } Ref(const Variant &p_variant) { diff --git a/core/string_buffer.h b/core/string_buffer.h index b148e4554..7e9b151be 100644 --- a/core/string_buffer.h +++ b/core/string_buffer.h @@ -39,7 +39,7 @@ class StringBuffer { CharType short_buffer[SHORT_BUFFER_SIZE]; String buffer; - int string_length = 0; + int string_length; _FORCE_INLINE_ CharType *current_buffer_ptr() { return static_cast<Vector<CharType> &>(buffer).empty() ? short_buffer : buffer.ptrw(); @@ -79,6 +79,10 @@ public: _FORCE_INLINE_ operator String() { return as_string(); } + + StringBuffer() { + string_length = 0; + } }; template <int SHORT_BUFFER_SIZE> diff --git a/core/string_builder.h b/core/string_builder.h index 9e2599ac3..596b3bf73 100644 --- a/core/string_builder.h +++ b/core/string_builder.h @@ -37,7 +37,7 @@ class StringBuilder { - uint32_t string_length = 0; + uint32_t string_length; Vector<String> strings; Vector<const char *> c_strings; @@ -75,6 +75,10 @@ public: _FORCE_INLINE_ operator String() const { return as_string(); } + + StringBuilder() { + string_length = 0; + } }; #endif // STRING_BUILDER_H |
