godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17686 from marcelofg55/in_class_fix 

Fix several in-class initialization clang warning
This commit is contained in:
Rémi Verschelde 2018-03-22 16:47:32 +01:00 committed by GitHub
parent 4b00cc9f8a 35d21c0881
commit cc34406b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/command_queue_mt.cpp
View File

@ -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++) {

6
core/command_queue_mt.h
View File

@ -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;

5
core/reference.h
View File

@ -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) {

6
core/string_buffer.h
View File

@ -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>

6
core/string_builder.h
View File

@ -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

2
platform/osx/os_osx.h
View File

@ -100,7 +100,7 @@ public:
id context;
CursorShape cursor_shape;
NSCursor *cursors[CURSOR_MAX] = { NULL };
NSCursor *cursors[CURSOR_MAX];
MouseMode mouse_mode;
String title;

1
platform/osx/os_osx.mm
View File

@ -2369,6 +2369,7 @@ OS_OSX *OS_OSX::singleton = NULL;
OS_OSX::OS_OSX() {
memset(cursors, 0, sizeof(cursors));
key_event_pos = 0;
mouse_mode = OS::MOUSE_MODE_VISIBLE;
main_loop = NULL;