firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

Fixed CORE-6026 - Alignment issue with FB_MESSAGE C++ macro

Browse Source 
(as well UDR macros) and BIGINT/DECFLOAT types in Linux 32-bits.
This commit is contained in:
Adriano dos Santos Fernandes 2019-03-18 12:23:34 -03:00
parent bb3c2e94ec
commit 41b2683b8a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/include/firebird/Message.h
View File

@ -29,6 +29,12 @@
#include <assert.h>
#include <string.h>
#if defined(__linux__) && defined(__i386__)
#define FB__INT64_ALIGNAS alignas(8)
#else
#define FB__INT64_ALIGNAS
#endif
#define FB_MESSAGE(name, statusType, fields) \
FB__MESSAGE_I(name, statusType, 2, FB_BOOST_PP_CAT(FB__MESSAGE_X fields, 0), )
@ -195,14 +201,14 @@
#define FB__TYPE_FB_SCALED_SMALLINT(x) ISC_SHORT
#define FB__TYPE_FB_SCALED_INTEGER(x) ISC_LONG
#define FB__TYPE_FB_SCALED_BIGINT(x) ISC_INT64
#define FB__TYPE_FB_SCALED_BIGINT(x) FB__INT64_ALIGNAS ISC_INT64
#define FB__TYPE_FB_SMALLINT ISC_SHORT
#define FB__TYPE_FB_INTEGER ISC_LONG
#define FB__TYPE_FB_BIGINT ISC_INT64
#define FB__TYPE_FB_BIGINT FB__INT64_ALIGNAS ISC_INT64
#define FB__TYPE_FB_FLOAT float
#define FB__TYPE_FB_DOUBLE double
#define FB__TYPE_FB_DECFLOAT16 FB_DEC16
#define FB__TYPE_FB_DECFLOAT34 FB_DEC34
#define FB__TYPE_FB_DECFLOAT16 FB__INT64_ALIGNAS FB_DEC16
#define FB__TYPE_FB_DECFLOAT34 FB__INT64_ALIGNAS FB_DEC34
#define FB__TYPE_FB_BLOB ISC_QUAD
#define FB__TYPE_FB_BOOLEAN ISC_UCHAR
#define FB__TYPE_FB_DATE ::Firebird::FbDate