From 2551689ec6e78cec3569950a80b711916fd95fae Mon Sep 17 00:00:00 2001
From: winkler-pixop <winkler@pixop.com>
Date: Tue, 1 Oct 2024 08:00:38 +0200
Subject: [PATCH] Fix #19683 : Generated code fails to build with 
 x86_64-linux-gnu-g++-13 (#19684)

* Add C++ header for cpp-pistache-server to fix breaking CMake build of generated code.

* Sort includes of system C++ headers for cpp-pistache-server.

* Add samples generated from fixing bug #19683.
---
 .../resources/cpp-pistache-server/helpers-header.mustache  | 7 ++++---
 .../petstore/cpp-pistache-everything/model/Helpers.h       | 7 ++++---
 .../cpp-pistache-nested-schema-refs/model/Helpers.h        | 7 ++++---
 samples/server/petstore/cpp-pistache/model/Helpers.h       | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/helpers-header.mustache
index 4ea12ef9481..328dc2ee2b8 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/helpers-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/helpers-header.mustache
@@ -8,12 +8,13 @@
 #ifndef {{prefix}}Helpers_H_
 #define {{prefix}}Helpers_H_
 
+#include <cstdint>
 #include <ctime>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace {{helpersNamespace}}
 {
diff --git a/samples/server/petstore/cpp-pistache-everything/model/Helpers.h b/samples/server/petstore/cpp-pistache-everything/model/Helpers.h
index 0ab06c03df4..84354f85a2f 100644
--- a/samples/server/petstore/cpp-pistache-everything/model/Helpers.h
+++ b/samples/server/petstore/cpp-pistache-everything/model/Helpers.h
@@ -18,12 +18,13 @@
 #ifndef Helpers_H_
 #define Helpers_H_
 
+#include <cstdint>
 #include <ctime>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace org::openapitools::server::helpers
 {
diff --git a/samples/server/petstore/cpp-pistache-nested-schema-refs/model/Helpers.h b/samples/server/petstore/cpp-pistache-nested-schema-refs/model/Helpers.h
index 9637a1cb6af..9c2581081fc 100644
--- a/samples/server/petstore/cpp-pistache-nested-schema-refs/model/Helpers.h
+++ b/samples/server/petstore/cpp-pistache-nested-schema-refs/model/Helpers.h
@@ -18,12 +18,13 @@
 #ifndef Helpers_H_
 #define Helpers_H_
 
+#include <cstdint>
 #include <ctime>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace org::openapitools::server::helpers
 {
diff --git a/samples/server/petstore/cpp-pistache/model/Helpers.h b/samples/server/petstore/cpp-pistache/model/Helpers.h
index 0ab06c03df4..84354f85a2f 100644
--- a/samples/server/petstore/cpp-pistache/model/Helpers.h
+++ b/samples/server/petstore/cpp-pistache/model/Helpers.h
@@ -18,12 +18,13 @@
 #ifndef Helpers_H_
 #define Helpers_H_
 
+#include <cstdint>
 #include <ctime>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace org::openapitools::server::helpers
 {