Skip to content

Commit 5cc618c

Browse files
authored
Fix compilation errors against android-clang (#6174)
Signed-off-by: Ricardo González Moreno <[email protected]>
1 parent 2ba9615 commit 5cc618c

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct FlowQueue
126126
}
127127

128128
// TODO: remove optimization with GCC > 15
129-
#if defined(__linux__) && defined(__GNUC__)
129+
#if defined(__linux__) && defined(__GNUC__) && !defined(__clang__)
130130
[[gnu::optimize("no-delete-null-pointer-checks")]]
131131
#endif // if defined(__GNUC__)
132132
bool is_empty() const noexcept

test/performance/throughput/ThroughputSubscriber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ void ThroughputSubscriber::run()
781781
{
782782
command_sample.m_totaltime = std::numeric_limits<uint64_t>::min();
783783
}
784-
else if (total_time_count > std::numeric_limits<uint64_t>::max())
784+
else if (total_time_count > std::numeric_limits<double>::max())
785785
{
786786
command_sample.m_totaltime = std::numeric_limits<uint64_t>::max();
787787
}

test/profiling/main_MemoryTest.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
using namespace eprosima::fastdds;
3636
using namespace eprosima::fastdds::rtps;
3737

38-
#if FASTDDS_IS_BIG_ENDIAN_TARGET
39-
const Endianness_t DEFAULT_ENDIAN = BIGEND;
40-
#else
41-
const Endianness_t DEFAULT_ENDIAN = LITTLEEND;
42-
#endif // if FASTDDS_IS_BIG_ENDIAN_TARGET
43-
4438
#if defined(_WIN32)
4539
#define COPYSTR strcpy_s
4640
#else

0 commit comments

Comments
 (0)