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
596d4261
Unverified
Commit
596d4261
authored
May 03, 2020
by
Hugo Locurcio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some C++11 polyfill defines that are no longer needed
parent
d2887ea7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
29 deletions
+1
-29
logger.cpp
core/io/logger.cpp
+0
-11
variant.h
core/variant.h
+1
-8
string_utils.cpp
modules/mono/utils/string_utils.cpp
+0
-10
No files found.
core/io/logger.cpp
View file @
596d4261
...
...
@@ -34,17 +34,6 @@
#include "core/os/os.h"
#include "core/print_string.h"
// va_copy was defined in the C99, but not in C++ standards before C++11.
// When you compile C++ without --std=c++<XX> option, compilers still define
// va_copy, otherwise you have to use the internal version (__va_copy).
#if !defined(va_copy)
#if defined(__GNUC__)
#define va_copy(d, s) __va_copy((d), (s))
#else
#define va_copy(d, s) ((d) = (s))
#endif
#endif
#if defined(MINGW_ENABLED) || defined(_MSC_VER)
#define sprintf sprintf_s
#endif
...
...
core/variant.h
View file @
596d4261
...
...
@@ -67,13 +67,6 @@ typedef Vector<Vector2> PackedVector2Array;
typedef
Vector
<
Vector3
>
PackedVector3Array
;
typedef
Vector
<
Color
>
PackedColorArray
;
// Temporary workaround until c++11 alignas()
#ifdef __GNUC__
#define GCC_ALIGNED_8 __attribute__((aligned(8)))
#else
#define GCC_ALIGNED_8
#endif
class
Variant
{
public
:
// If this changes the table in variant_op must be updated
...
...
@@ -211,7 +204,7 @@ private:
PackedArrayRefBase
*
packed_array
;
void
*
_ptr
;
//generic pointer
uint8_t
_mem
[
sizeof
(
ObjData
)
>
(
sizeof
(
real_t
)
*
4
)
?
sizeof
(
ObjData
)
:
(
sizeof
(
real_t
)
*
4
)];
}
_data
GCC_ALIGNED_8
;
}
_data
alignas
(
8
)
;
void
reference
(
const
Variant
&
p_variant
);
void
clear
();
...
...
modules/mono/utils/string_utils.cpp
View file @
596d4261
...
...
@@ -196,16 +196,6 @@ String str_format(const char *p_format, ...) {
return
res
;
}
// va_copy was defined in the C99, but not in C++ standards before C++11.
// When you compile C++ without --std=c++<XX> option, compilers still define
// va_copy, otherwise you have to use the internal version (__va_copy).
#if !defined(va_copy)
#if defined(__GNUC__)
#define va_copy(d, s) __va_copy((d), (s))
#else
#define va_copy(d, s) ((d) = (s))
#endif
#endif
#if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900
#define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_args_copy)
...
...
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