From a817cca0e001096b35b060e751bfefe4cc3a3b67 Mon Sep 17 00:00:00 2001 From: SergeyRyabinin Date: Wed, 11 Dec 2024 06:58:30 +0000 Subject: [PATCH] Revert "compilation fix access protected member of parent class for older GCC (#3216)" This reverts commit 55372a21de51490ab435c38088b3476d405033ab. --- crt/aws-crt-cpp | 2 +- .../include/aws/core/client/AWSErrorMarshaller.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp index 281a7caff7e..b5577fa39c3 160000 --- a/crt/aws-crt-cpp +++ b/crt/aws-crt-cpp @@ -1 +1 @@ -Subproject commit 281a7caff7e10f68a5422d8fca8acf0b48e4215f +Subproject commit b5577fa39c3a11f09c06db10ac6eaaca3910cbe2 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 a486125f646..6b0bc2d03d9 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,8 +94,6 @@ namespace Aws }; class AWS_CORE_API JsonErrorMarshallerQueryCompatible : public JsonErrorMarshaller { - using AWSErrorMarshaller::Marshall; - public: /** * Converts an exceptionName and message into an Error object, if it