Fix "Templates cannot be declared to have 'C' Linkage"
This commit is contained in:
parent
73a2062d70
commit
f28e4827e5
@ -5703,6 +5703,10 @@ struct nk_context {
|
||||
#define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m))
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
template<typename T> struct nk_alignof;
|
||||
template<typename T, int size_diff> struct nk_helper{enum {value = size_diff};};
|
||||
@ -5717,9 +5721,6 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
|
||||
#define NK_CONTAINER_OF(ptr,type,member)\
|
||||
(type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member)))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* NK_NUKLEAR_H_ */
|
||||
@ -29536,6 +29537,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
|
||||
/// - [yy]: Minor version with non-breaking API and library changes
|
||||
/// - [zz]: Bug fix version with no direct changes to API
|
||||
///
|
||||
/// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage"
|
||||
/// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds
|
||||
/// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible
|
||||
/// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nuklear",
|
||||
"version": "4.08.2",
|
||||
"version": "4.08.3",
|
||||
"repo": "Immediate-Mode-UI/Nuklear",
|
||||
"description": "A small ANSI C gui toolkit",
|
||||
"keywords": ["gl", "ui", "toolkit"],
|
||||
|
@ -8,6 +8,7 @@
|
||||
/// - [yy]: Minor version with non-breaking API and library changes
|
||||
/// - [zz]: Bug fix version with no direct changes to API
|
||||
///
|
||||
/// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage"
|
||||
/// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds
|
||||
/// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible
|
||||
/// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles
|
||||
|
@ -5482,6 +5482,10 @@ struct nk_context {
|
||||
#define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m))
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
template<typename T> struct nk_alignof;
|
||||
template<typename T, int size_diff> struct nk_helper{enum {value = size_diff};};
|
||||
@ -5496,9 +5500,6 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
|
||||
#define NK_CONTAINER_OF(ptr,type,member)\
|
||||
(type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member)))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* NK_NUKLEAR_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user