From a51c4e0045f3e73df88cf4bac2abd8d8acc4e0b3 Mon Sep 17 00:00:00 2001 From: VincentMiras Date: Mon, 20 Oct 2025 11:28:30 +0200 Subject: [PATCH 1/3] Suppression des imports Cache et adaptation des imports vers les nouvelles classes --- src/Request.cpp | 2 +- src/configurations/Layer.cpp | 1 - src/configurations/Services.cpp | 2 -- src/main.cpp | 3 ++- src/services/wms/Service.cpp | 1 - src/services/wms/getmap.cpp | 1 - 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Request.cpp b/src/Request.cpp index 1c1288b..4eec173 100644 --- a/src/Request.cpp +++ b/src/Request.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include "Utils.h" diff --git a/src/configurations/Layer.cpp b/src/configurations/Layer.cpp index 508cad4..62d2240 100644 --- a/src/configurations/Layer.cpp +++ b/src/configurations/Layer.cpp @@ -51,7 +51,6 @@ #include #include -#include #include #include diff --git a/src/configurations/Services.cpp b/src/configurations/Services.cpp index 0fd67c6..ba97d87 100644 --- a/src/configurations/Services.cpp +++ b/src/configurations/Services.cpp @@ -37,8 +37,6 @@ #include -#include - #include "configurations/Services.h" bool ServicesConfiguration::parse(json11::Json& doc) { diff --git a/src/main.cpp b/src/main.cpp index d700b54..bbd4071 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,7 +76,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/src/services/wms/Service.cpp b/src/services/wms/Service.cpp index 8bb78d5..69b322f 100644 --- a/src/services/wms/Service.cpp +++ b/src/services/wms/Service.cpp @@ -46,7 +46,6 @@ #include #include -#include #include "services/wms/Exception.h" #include "services/wms/Service.h" diff --git a/src/services/wms/getmap.cpp b/src/services/wms/getmap.cpp index 96c440b..b2ddd50 100644 --- a/src/services/wms/getmap.cpp +++ b/src/services/wms/getmap.cpp @@ -46,7 +46,6 @@ #include #include -#include #include #include #include From 4aa6d8d19d47aeef79ee15fcfd9a3f42fcb5c3dc Mon Sep 17 00:00:00 2001 From: VincentMiras Date: Mon, 20 Oct 2025 15:10:39 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c7a377..33bbd6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## Unreleased + +### [Added] +### [Changed] + +* Changement des imports de Cache aux imports spécifiques des classes suite à la séparation du fichier Cache dans core-cpp. + +### [Deprecated] +### [Removed] +### [Fixed] +### [Security] + ## 6.1.6 ### [Fixed] From c7f036ae84980d73c845b04712973337dbe02410 Mon Sep 17 00:00:00 2001 From: VincentMiras Date: Mon, 20 Oct 2025 17:21:53 +0200 Subject: [PATCH 3/3] Ajout import manquant pour la compilation --- src/Rok4Server.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Rok4Server.h b/src/Rok4Server.h index c57b17d..8b4e765 100644 --- a/src/Rok4Server.h +++ b/src/Rok4Server.h @@ -59,6 +59,8 @@ class Server; #include "configurations/Services.h" #include "configurations/Layer.h" +#include + #include "Request.h" #include "config.h"