diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-19 10:51:34 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-19 10:51:34 +0200 |
| commit | d1960bf491d568c0c4bf1420cf51fede897a1d4b (patch) | |
| tree | 7c2c5c430731050186ea13575ad440e12832b84f /fnet | |
| parent | fde4d16272d9b0d689a3066cf613a8191d02cc13 (diff) | |
Reduce use of ifdef constructs.
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/tests/info/info.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/fnet/src/tests/info/info.cpp b/fnet/src/tests/info/info.cpp index f7c3c650372..938ea1b7f15 100644 --- a/fnet/src/tests/info/info.cpp +++ b/fnet/src/tests/info/info.cpp @@ -70,29 +70,21 @@ TEST("info") { TEST("size of important objects") { #ifdef __APPLE__ - EXPECT_EQUAL(192u, sizeof(FNET_IOComponent)); + constexpr size_t MUTEX_SIZE = 64u; #else - EXPECT_EQUAL(168u, sizeof(FNET_IOComponent)); + constexpr size_t MUTEX_SIZE = 40u; #endif + EXPECT_EQUAL(MUTEX_SIZE + 128u, sizeof(FNET_IOComponent)); EXPECT_EQUAL(32u, sizeof(FNET_Channel)); EXPECT_EQUAL(40u, sizeof(FNET_PacketQueue_NoLock)); -#ifdef __APPLE__ - EXPECT_EQUAL(496u, sizeof(FNET_Connection)); -#else - EXPECT_EQUAL(472u, sizeof(FNET_Connection)); -#endif + EXPECT_EQUAL(MUTEX_SIZE + 432u, sizeof(FNET_Connection)); EXPECT_EQUAL(48u, sizeof(std::condition_variable)); EXPECT_EQUAL(56u, sizeof(FNET_DataBuffer)); EXPECT_EQUAL(24u, sizeof(FastOS_Time)); EXPECT_EQUAL(8u, sizeof(FNET_Context)); EXPECT_EQUAL(8u, sizeof(fastos::TimeStamp)); -#ifdef __APPLE__ - EXPECT_EQUAL(64u, sizeof(std::mutex)); - EXPECT_EQUAL(64u, sizeof(pthread_mutex_t)); -#else - EXPECT_EQUAL(40u, sizeof(std::mutex)); - EXPECT_EQUAL(40u, sizeof(pthread_mutex_t)); -#endif + EXPECT_EQUAL(MUTEX_SIZE, sizeof(std::mutex)); + EXPECT_EQUAL(MUTEX_SIZE, sizeof(pthread_mutex_t)); EXPECT_EQUAL(48u, sizeof(pthread_cond_t)); EXPECT_EQUAL(48u, sizeof(std::condition_variable)); } |