From 5124c510f8ac23f70719ac87fc4bdeccf87aeabb Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 11 Jun 2015 03:06:58 +0000 Subject: [PATCH] Fix serial endian_access -fno-inline build --- common/include/serial.h | 13 +++++++++---- similar/main/multibot.cpp | 5 +++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/include/serial.h b/common/include/serial.h index f9ab94589..3f9f62e6a 100644 --- a/common/include/serial.h +++ b/common/include/serial.h @@ -107,10 +107,15 @@ public: * - native_endian: assume buffered data is native endian * Copy regardless of host byte order */ - static constexpr auto foreign_endian= tt::integral_constant{}; - static constexpr auto little_endian = tt::integral_constant{}; - static constexpr auto big_endian = tt::integral_constant{}; - static constexpr auto native_endian = tt::integral_constant{}; + typedef tt::integral_constant foreign_endian_type; + typedef tt::integral_constant little_endian_type; + typedef tt::integral_constant big_endian_type; + typedef tt::integral_constant native_endian_type; + + static constexpr auto foreign_endian = foreign_endian_type{}; + static constexpr auto little_endian = little_endian_type{}; + static constexpr auto big_endian = big_endian_type{}; + static constexpr auto native_endian = native_endian_type{}; }; /* Implementation details - avoid namespace pollution */ diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp index fa75cf248..aa805b8ac 100644 --- a/similar/main/multibot.cpp +++ b/similar/main/multibot.cpp @@ -64,6 +64,11 @@ static void multi_send_robot_position_sub(const vobjptridx_t objnum, int now); static void multi_send_release_robot(const vobjptridx_t objnum); static void multi_delete_controlled_robot(const vobjptridx_t objnum); +constexpr serial::endian_access::foreign_endian_type serial::endian_access::foreign_endian; +constexpr serial::endian_access::little_endian_type serial::endian_access::little_endian; +constexpr serial::endian_access::big_endian_type serial::endian_access::big_endian; +constexpr serial::endian_access::native_endian_type serial::endian_access::native_endian; + // // Code for controlling robots in multiplayer games //