Bug#36040942 router build on 32bit linux fails

weigon · weigon · commit 8d6ded761f1f · 2023-11-23T15:55:36.000+01:00
On Linux 32bit, make all fails with:

router/src/harness/tests/linux_timestamping.cc:156:5: error: missing
binary operator before token "("
  156 | #if SO_TIMESTAMP == SO_TIMESTAMP_NEW
      |     ^~~~~~~~~~~~

That's caused by SO_TIMESTAMP being defined as:

  #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ?
  SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

(in /usr/include/asm-generic/socket.h). But ?: isn't allowed in an
"#if".

Change
======

- use std::conditional_t&lt;&gt; instead of ifdef to select the right type.

Change-Id: I3243812ab04eae509baeec259572e42a03aa36d1
diff --git a/router/src/harness/tests/linux_timestamping.cc b/router/src/harness/tests/linux_timestamping.cc
@@ -32,6 +32,7 @@
 #include <string>
 #include <string_view>
 #include <thread>
+#include <type_traits>
 #include <vector>
 
 #include "hexify.h"
@@ -151,17 +152,16 @@ using SocketTimestampOld =
 
 #ifdef SO_TIMESTAMP
 // linux + freebsd
-using SocketTimestamp = SocketTimestampBase<SOL_SOCKET, SO_TIMESTAMP,
+using SocketTimestamp =
+    SocketTimestampBase<SOL_SOCKET, SO_TIMESTAMP,
 #ifdef SO_TIMESTAMP_NEW
-#if SO_TIMESTAMP == SO_TIMESTAMP_NEW
-                                            SocketTimestampNew::value_type
+                        std::conditional_t<SO_TIMESTAMP == SO_TIMESTAMP_NEW,
+                                           SocketTimestampNew::value_type,
+                                           SocketTimestampOld::value_type>
 #else
-                                            SocketTimestampOld::value_type
+                        timeval
 #endif
-#else
-                                            timeval
-#endif
-                                            >;
+                        >;
 #endif
 
 template <int Lvl, int Type, class V>
@@ -205,18 +205,16 @@ using SocketTimestampNanosecondOld =
 #endif
 
 #ifdef SO_TIMESTAMPNS
-using SocketTimestampNanosecond =
-    SocketTimestampNanosecondBase<SOL_SOCKET, SO_TIMESTAMPNS,
+using SocketTimestampNanosecond = SocketTimestampNanosecondBase<
+    SOL_SOCKET, SO_TIMESTAMPNS,
 #ifdef SO_TIMESTAMPNS_NEW
-#if SO_TIMESTAMPNS == SO_TIMESTAMPNS_NEW
-                                  SocketTimestampNanosecondNew::value_type
-#else
-                                  SocketTimestampNanosecondOld::value_type
-#endif
+    std::conditional_t<SO_TIMESTAMPNS == SO_TIMESTAMPNS_NEW,
+                       SocketTimestampNanosecondNew::value_type,
+                       SocketTimestampNanosecondOld::value_type>
 #else
-                                  timespec
+    timespec
 #endif
-                                  >;
+    >;
 #endif
 
 template <int Lvl, int Type, class V>
@@ -290,20 +288,17 @@ using SocketTimestampingOld =
 #endif
 
 #ifdef SO_TIMESTAMPING
-using SocketTimestamping =
-    SocketTimestampingBase<SOL_SOCKET, SO_TIMESTAMPING,
+using SocketTimestamping = SocketTimestampingBase<
+    SOL_SOCKET, SO_TIMESTAMPING,
 #ifdef SO_TIMESTAMPING_NEW
-#if SO_TIMESTAMPING == SO_TIMESTAMPING_NEW
-                           SocketTimestampingNew::value_type
-#else
-                           SocketTimestampingOld::value_type
-#endif
+    std::conditional_t<SO_TIMESTAMPING == SO_TIMESTAMPING_NEW,
+                       SocketTimestampingNew::value_type,
+                       SocketTimestampingOld::value_type>
 #else
-                           std::conditional_t<
-                               is_type_complete_v<struct scm_timestamping>,
-                               scm_timestamping, fallback::scm_timestamping>
+    std::conditional_t<is_type_complete_v<struct scm_timestamping>,
+                       scm_timestamping, fallback::scm_timestamping>
 #endif
-                           >;
+    >;
 #endif
 
 // if they are defined, check they have the expected value.
