godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Style: Ensure consistent formatting with clang-format 15

Browse Source 
When going from version 14 to 15 it would introduce a tiny change in
`websocket_macros.h` just before the comment re-enabling clang-format,
but this can be solved by just letting it do its work.

Bonus cosmetic change in `math_fieldwise.cpp` where clang-format isn't
used, and bump recommended versions for pre-commit hook to [13; 15].
This commit is contained in:
Rémi Verschelde
2022-09-21 12:48:48 +02:00
parent 307f560b39
commit 5408af1407
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
modules/websocket/websocket_macros.h
View File

@@ -35,34 +35,32 @@
#define DEF_PKT_SHIFT 10
#define DEF_BUF_SHIFT 16
/* clang-format off */
#define GDCICLASS(CNAME) \
public:\
static CNAME *(*_create)();\
\
static Ref<CNAME > create_ref() {\
\
if (!_create)\
return Ref<CNAME >();\
return Ref<CNAME >(_create());\
}\
\
static CNAME *create() {\
\
if (!_create)\
return nullptr;\
return _create();\
}\
protected:\
#define GDCICLASS(CNAME) \
public: \
static CNAME *(*_create)(); \
\
static Ref<CNAME> create_ref() { \
if (!_create) \
return Ref<CNAME>(); \
return Ref<CNAME>(_create()); \
} \
\
static CNAME *create() { \
if (!_create) \
return nullptr; \
return _create(); \
} \
\
protected:
#define GDCINULL(CNAME) \
CNAME *(*CNAME::_create)() = nullptr;
CNAME *(*CNAME::_create)() = nullptr;
#define GDCIIMPL(IMPNAME, CNAME) \
public:\
static CNAME *_create() { return memnew(IMPNAME); }\
static void make_default() { CNAME::_create = IMPNAME::_create; }\
protected:\
/* clang-format on */
#define GDCIIMPL(IMPNAME, CNAME) \
public: \
static CNAME *_create() { return memnew(IMPNAME); } \
static void make_default() { CNAME::_create = IMPNAME::_create; } \
\
protected:
#endif // WEBSOCKET_MACROS_H