From 85fb0866a73ed45dbce19d90c2442155a661b47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20J=C3=A4ger?= Date: Tue, 25 Jun 2024 09:15:02 +0000 Subject: [PATCH 1/4] chore: Update Dockerfile to use gcc 13 and g++ 13 --- .devcontainer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 718ab58..be4ada7 100755 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/cpp:jammy +FROM mcr.microsoft.com/devcontainers/cpp:noble SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -35,8 +35,8 @@ RUN apt-get update && apt-get upgrade --yes && \ gdb \ locales \ clang-format \ - gcc-12 \ - g++-12 && \ + gcc-13 \ + g++-13 && \ \ # cleanup apt-get autoremove --purge -y && \ From 68943e61868b69f4f56bb9d52026f081085506cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20J=C3=A4ger?= Date: Tue, 25 Jun 2024 13:00:25 +0000 Subject: [PATCH 2/4] chore: Add boost-filesystem dependency to vcpkg.json --- .devcontainer/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/vcpkg.json b/.devcontainer/vcpkg.json index a422703..8ef0e0d 100644 --- a/.devcontainer/vcpkg.json +++ b/.devcontainer/vcpkg.json @@ -2,6 +2,7 @@ "dependencies": [ "boost-log", "boost-program-options", + "boost-filesystem", "icu", "boost-timer", "shapelib", From e82d5ac4101f9fda93f4aafc657b4023b7c3caad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20J=C3=A4ger?= Date: Tue, 25 Jun 2024 16:59:44 +0000 Subject: [PATCH 3/4] fic include --- plugins/navteq/navteq_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/navteq/navteq_plugin.cpp b/plugins/navteq/navteq_plugin.cpp index ab044b9..b19fd37 100644 --- a/plugins/navteq/navteq_plugin.cpp +++ b/plugins/navteq/navteq_plugin.cpp @@ -6,10 +6,10 @@ */ #include -#include -#include +#include #include #include +#include #include #include #include From 9ae63c93939b4d5be4180efcd2d87c8917c015c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20J=C3=A4ger?= Date: Tue, 25 Jun 2024 18:42:03 +0000 Subject: [PATCH 4/4] fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa3ff09..d8cdef9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,8 @@ jobs: # Change this to be your CI task/script runCmd: | # Add multiple commands to run if needed - export CC=gcc-12 - export CXX=g++-12 + export CC=gcc-13 + export CXX=g++-13 mkdir -p build cd build cmake -G'Ninja' -DVCPKG_INSTALLED_DIR=/vcpkg_installed -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..