Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
35d21c08
Commit
35d21c08
authored
Mar 22, 2018
by
Marcelo Fernandez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several in-class initialization clang warning
parent
f2df8c94
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
9 deletions
+18
-9
command_queue_mt.cpp
core/command_queue_mt.cpp
+1
-0
command_queue_mt.h
core/command_queue_mt.h
+3
-3
reference.h
core/reference.h
+2
-3
string_buffer.h
core/string_buffer.h
+5
-1
string_builder.h
core/string_builder.h
+5
-1
os_osx.h
platform/osx/os_osx.h
+1
-1
os_osx.mm
platform/osx/os_osx.mm
+1
-0
No files found.
core/command_queue_mt.cpp
View file @
35d21c08
...
...
@@ -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
++
)
{
...
...
core/command_queue_mt.h
View file @
35d21c08
...
...
@@ -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
;
...
...
core/reference.h
View file @
35d21c08
...
...
@@ -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
)
{
...
...
core/string_buffer.h
View file @
35d21c08
...
...
@@ -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
>
...
...
core/string_builder.h
View file @
35d21c08
...
...
@@ -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
platform/osx/os_osx.h
View file @
35d21c08
...
...
@@ -100,7 +100,7 @@ public:
id
context
;
CursorShape
cursor_shape
;
NSCursor
*
cursors
[
CURSOR_MAX
]
=
{
NULL
}
;
NSCursor
*
cursors
[
CURSOR_MAX
];
MouseMode
mouse_mode
;
String
title
;
...
...
platform/osx/os_osx.mm
View file @
35d21c08
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment