From 1fccfdc57745fedc4bfa42f2976107beee203a52 Mon Sep 17 00:00:00 2001 From: Soumava Bera Date: Tue, 10 Dec 2024 16:05:10 -0500 Subject: [PATCH 1/2] fix compilation --- .../include/aws/core/client/AWSErrorMarshaller.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h b/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h index 6b0bc2d03d9..dd1ef21b155 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h +++ b/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h @@ -94,6 +94,7 @@ namespace Aws }; class AWS_CORE_API JsonErrorMarshallerQueryCompatible : public JsonErrorMarshaller { + using AWSErrorMarshaller::Marshall; public: /** * Converts an exceptionName and message into an Error object, if it From 729fb26d43e8648e3cb3a42d036f18f69f0fb490 Mon Sep 17 00:00:00 2001 From: Soumava Bera Date: Tue, 10 Dec 2024 18:31:22 -0500 Subject: [PATCH 2/2] format fix --- crt/aws-crt-cpp | 2 +- .../include/aws/core/client/AWSErrorMarshaller.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp index b5577fa39c3..281a7caff7e 160000 --- a/crt/aws-crt-cpp +++ b/crt/aws-crt-cpp @@ -1 +1 @@ -Subproject commit b5577fa39c3a11f09c06db10ac6eaaca3910cbe2 +Subproject commit 281a7caff7e10f68a5422d8fca8acf0b48e4215f diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h b/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h index dd1ef21b155..a486125f646 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h +++ b/src/aws-cpp-sdk-core/include/aws/core/client/AWSErrorMarshaller.h @@ -94,7 +94,8 @@ namespace Aws }; class AWS_CORE_API JsonErrorMarshallerQueryCompatible : public JsonErrorMarshaller { - using AWSErrorMarshaller::Marshall; + using AWSErrorMarshaller::Marshall; + public: /** * Converts an exceptionName and message into an Error object, if it