Skip to content

Commit 3772a35

Browse files
raulojeda22MiguelCompany
authored andcommitted
Fix build in GCC 15 (#6263)
* Include cstdint needed in g++ 15.2.0 Signed-off-by: Raül <raulojeda@eprosima.com> * Add Security and Statistics features in the alternative build workflow Signed-off-by: Raül <raulojeda@eprosima.com> * Suprpess false positive warning in GCC 15 at sqlite3.c Signed-off-by: Raül <raulojeda@eprosima.com> * Add missing cmake-args and includes in alphabetical order Signed-off-by: Raül <raulojeda@eprosima.com> --------- Signed-off-by: Raül <raulojeda@eprosima.com> (cherry picked from commit 8b28dab)
1 parent 4ab3b21 commit 3772a35

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/docker/ubuntu/alternative_builds/fastdds_gcc_latest.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
4747
libtinyxml2-dev \
4848
openssl
4949

50-
ENTRYPOINT ["/bin/bash", "-c", "cd && colcon build --event-handlers=console_direct+"]
50+
ENTRYPOINT ["/bin/bash", "-c", "cd && colcon build --event-handlers=console_direct+ --cmake-args -DSECURITY=ON -DFASTDDS_STATISTICS=ON"]

src/cpp/rtps/persistence/sqlite3.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35248,8 +35248,7 @@ SQLITE_PRIVATE int sqlite3IsOverflow(double x){
3524835248
** than 1GiB) the value returned might be less than the true string length.
3524935249
*/
3525035250
SQLITE_PRIVATE int sqlite3Strlen30(const char *z){
35251-
if( z==0 ) return 0;
35252-
return 0x3fffffff & (int)strlen(z);
35251+
return z==0 ? 0 : (0x3fffffff & (int)strlen(z));
3525335252
}
3525435253

3525535254
/*

src/cpp/rtps/security/common/SharedSecretHandle.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include <rtps/security/common/Handle.h>
2222

23+
#include <cstdint>
2324
#include <vector>
2425

2526
namespace eprosima {

0 commit comments

Comments
 (0)