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
4cb08876
Unverified
Commit
4cb08876
authored
Jul 02, 2019
by
Rémi Verschelde
Committed by
GitHub
Jul 02, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #30249 from marxin/fix-gcc9-warnings
Fix few GCC9 warnings:
parents
78af5625
f48bb8fa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
editor_audio_buses.h
editor/editor_audio_buses.h
+7
-0
texture_loader_dds.cpp
modules/dds/texture_loader_dds.cpp
+1
-1
types.h
thirdparty/assimp/include/assimp/types.h
+8
-1
No files found.
editor/editor_audio_buses.h
View file @
4cb08876
...
...
@@ -233,6 +233,13 @@ private:
render_db_value
=
n
.
render_db_value
;
}
_FORCE_INLINE_
AudioNotch
operator
=
(
const
EditorAudioMeterNotches
::
AudioNotch
&
n
)
{
relative_position
=
n
.
relative_position
;
db_value
=
n
.
db_value
;
render_db_value
=
n
.
render_db_value
;
return
*
this
;
}
_FORCE_INLINE_
AudioNotch
()
{}
};
...
...
modules/dds/texture_loader_dds.cpp
View file @
4cb08876
...
...
@@ -31,7 +31,7 @@
#include "texture_loader_dds.h"
#include "core/os/file_access.h"
#define PF_FOURCC(s) ((
(s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0]
))
#define PF_FOURCC(s) ((
uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0])
))
enum
{
DDS_MAGIC
=
0x20534444
,
...
...
thirdparty/assimp/include/assimp/types.h
View file @
4cb08876
...
...
@@ -161,7 +161,14 @@ struct aiColor3D
explicit
aiColor3D
(
ai_real
_r
)
:
r
(
_r
),
g
(
_r
),
b
(
_r
)
{}
aiColor3D
(
const
aiColor3D
&
o
)
:
r
(
o
.
r
),
g
(
o
.
g
),
b
(
o
.
b
)
{}
/** Component-wise comparison */
aiColor3D
&
operator
=
(
const
aiColor3D
&
o
)
{
r
=
o
.
r
;
g
=
o
.
g
;
b
=
o
.
b
;
return
*
this
;
}
/** Component-wise comparison */
// TODO: add epsilon?
bool
operator
==
(
const
aiColor3D
&
other
)
const
{
return
r
==
other
.
r
&&
g
==
other
.
g
&&
b
==
other
.
b
;}
...
...
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