Revert "compilation fix access protected member of parent class for o…

…lder GCC (#3216)" This reverts commit 55372a2.
aws · Dec 11, 2024 · a817cca · a817cca
1 parent 55372a2
commit a817cca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp
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
@@ -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
+1 −1		.clang-tidy
+146 −42		.github/workflows/ci.yml
+1 −1		.github/workflows/docs.yml
+1 −1		.github/workflows/release.yml
+13 −3		CMakeLists.txt
+1 −1		VERSION
+1 −1		crt/aws-c-cal
+1 −1		crt/aws-c-common
+1 −1		crt/aws-c-http
+1 −1		crt/aws-c-io
+1 −1		crt/aws-c-s3
+1 −1		crt/aws-c-sdkutils
+1 −1		crt/aws-checksums
+1 −1		crt/aws-lc
+1 −1		crt/s2n
+1 −0		include/aws/crt/Variant.h
+2 −0		include/aws/crt/mqtt/Mqtt5Client.h
+1 −1		include/aws/crt/mqtt/MqttConnection.h
+2 −0		include/aws/crt/mqtt/private/Mqtt5ClientCore.h
+1 −1		include/aws/crt/mqtt/private/MqttConnectionCore.h
+550 −0		include/aws/iot/MqttRequestResponseClient.h
+508 −0		source/iot/MqttRequestResponseClient.cpp
+5 −0		source/mqtt/Mqtt5Client.cpp
+1 −1		source/mqtt/MqttConnection.cpp
+1 −1		source/mqtt/MqttConnectionCore.cpp
+32 −0		tests/CMakeLists.txt
+1,099 −0		tests/MqttRequestResponse.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@