Skip to content

Commit 82a2a4e

Browse files
committed
Refs #8991: Set and check endianness with FASTCDR_IS_BIG_ENDIAN_TARGET instead of defining __BIG_ENDIAN__
Signed-off-by: EduPonz <[email protected]>
1 parent c5668b9 commit 82a2a4e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmake/common/check_configuration.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ macro(check_endianness)
7676
# Test endianness
7777
include(TestBigEndian)
7878
test_big_endian(BIG_ENDIAN)
79-
set(__BIG_ENDIAN__ ${BIG_ENDIAN})
79+
set(FASTCDR_IS_BIG_ENDIAN_TARGET ${BIG_ENDIAN})
8080
endmacro()
8181

8282
macro(check_msvc_arch)

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ AS_IF([test $HAVE_CXX11 = 1],
4747

4848
# Check endianess
4949
AC_C_BIGENDIAN(
50-
AC_DEFINE(__BIG_ENDIAN__, 1, [machine is bigendian]),
51-
AC_DEFINE(__BIG_ENDIAN__, 0, [machine is littleendian]),
50+
AC_DEFINE(FASTCDR_IS_BIG_ENDIAN_TARGET, 1, [machine is bigendian]),
51+
AC_DEFINE(FASTCDR_IS_BIG_ENDIAN_TARGET, 0, [machine is littleendian]),
5252
AC_MSG_ERROR(unknown endianess),
5353
AC_MSG_ERROR(universial endianess not supported)
5454
)

include/fastcdr/config.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
#endif
4343

4444
// Endianness defines
45-
#ifndef __BIG_ENDIAN__
46-
#define __BIG_ENDIAN__ @__BIG_ENDIAN__@
45+
#ifndef FASTCDR_IS_BIG_ENDIAN_TARGET
46+
#define FASTCDR_IS_BIG_ENDIAN_TARGET @FASTCDR_IS_BIG_ENDIAN_TARGET@
4747
#endif
4848

4949
#if defined(__ARM_ARCH) && __ARM_ARCH <= 7

src/cpp/Cdr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using namespace eprosima::fastcdr;
1919
using namespace ::exception;
2020

21-
#if __BIG_ENDIAN__
21+
#if FASTCDR_IS_BIG_ENDIAN_TARGET
2222
const Cdr::Endianness Cdr::DEFAULT_ENDIAN = BIG_ENDIANNESS;
2323
#else
2424
const Cdr::Endianness Cdr::DEFAULT_ENDIAN = LITTLE_ENDIANNESS;

0 commit comments

Comments
 (0)