Skip to content

Commit e112006

Browse files
Mario-DLmergify[bot]
authored andcommitted
Address some compilation warnings with GCC latest (#5796)
* Refs #23110: Add cstdint header for uint8_t Signed-off-by: Mario Dominguez <[email protected]> * Refs #23110: Remove unused using Signed-off-by: Mario Dominguez <[email protected]> * Refs #23110: Add missing cstdint to more headers Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: cferreiragonz <[email protected]> (cherry picked from commit e1524ac) # Conflicts: # src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp # src/cpp/rtps/reader/BaseReader.cpp
1 parent 4560db2 commit e112006

File tree

4 files changed

+550
-0
lines changed

4 files changed

+550
-0
lines changed

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERCOMPOUNDCONDITION_HPP_
2020
#define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERCOMPOUNDCONDITION_HPP_
2121

22+
#include <cstdint>
2223
#include <memory>
2324

2425
#include "DDSFilterCondition.hpp"

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERPREDICATE_HPP_
2020
#define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERPREDICATE_HPP_
2121

22+
#include <cstdint>
2223
#include <memory>
2324

2425
#include "DDSFilterCondition.hpp"

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
#ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERVALUE_HPP_
2020
#define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERVALUE_HPP_
2121

22+
<<<<<<< HEAD
23+
=======
24+
#include <fastcdr/cdr/fixed_size_string.hpp>
25+
26+
#include <cstdint>
27+
>>>>>>> e1524ac9 (Address some compilation warnings with GCC latest (#5796))
2228
#include <memory>
2329
#include <regex>
2430

0 commit comments

Comments
 (0)