From 2e32b7d182494094111808103efa5d4a06e6fda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Thu, 2 May 2024 11:07:32 +0000 Subject: [PATCH] tests: Update expected generated C sources --- .../annotations/deprecated-delegate-minimal.c-expected | 10 +++++----- tests/annotations/deprecated-enum-minimal.c-expected | 10 +++++----- tests/annotations/deprecated-method-minimal.c-expected | 10 +++++----- .../annotations/deprecated-property-minimal.c-expected | 10 +++++----- tests/annotations/deprecated-struct-minimal.c-expected | 10 +++++----- tests/annotations/deprecated.c-expected | 10 +++++----- tests/annotations/description.c-expected | 10 +++++----- .../arrays/cast-struct-boxed-element-access.c-expected | 10 +++++----- .../class-field-fixed-length-initializer.c-expected | 10 +++++----- tests/arrays/class-field-initializer.c-expected | 10 +++++----- tests/arrays/class-field-length-cname.c-expected | 10 +++++----- tests/arrays/constant-element-access.c-expected | 10 +++++----- tests/arrays/element-class-assignment.c-expected | 10 +++++----- tests/arrays/element-nullable-assignment.c-expected | 10 +++++----- tests/arrays/empty-length-0.c-expected | 10 +++++----- tests/arrays/field-global-length-cname.c-expected | 10 +++++----- tests/arrays/fixed-length-enum-value.c-expected | 10 +++++----- tests/arrays/fixed-length-init0-not-allowed.c-expected | 10 +++++----- tests/arrays/in-operator-with-boxed-needle.c-expected | 10 +++++----- tests/arrays/inline-namespace-field.c-expected | 10 +++++----- tests/arrays/inline-struct.c-expected | 10 +++++----- tests/arrays/length-inline-assignment.c-expected | 10 +++++----- tests/arrays/length-type-include.c-expected | 10 +++++----- tests/arrays/length-type.c-expected | 10 +++++----- tests/arrays/resize-local-size-captured.c-expected | 10 +++++----- tests/arrays/resize-local-size.c-expected | 10 +++++----- tests/arrays/resize.c-expected | 10 +++++----- tests/arrays/slice-fixed-length.c-expected | 10 +++++----- tests/arrays/struct-field-initializer.c-expected | 10 +++++----- tests/arrays/struct-field-length-cname.c-expected | 10 +++++----- tests/arrays/struct-initializer-null.c-expected | 10 +++++----- tests/arrays/struct-namespaced-initializer.c-expected | 10 +++++----- tests/asynchronous/bug595735.c-expected | 10 +++++----- tests/asynchronous/bug595755.c-expected | 10 +++++----- tests/asynchronous/bug596177.c-expected | 10 +++++----- tests/asynchronous/bug596861.c-expected | 10 +++++----- tests/asynchronous/bug597294.c-expected | 10 +++++----- tests/asynchronous/bug598677.c-expected | 10 +++++----- tests/asynchronous/bug598697.c-expected | 10 +++++----- tests/asynchronous/bug598698.c-expected | 10 +++++----- tests/asynchronous/bug599568.c-expected | 10 +++++----- tests/asynchronous/bug600827.c-expected | 10 +++++----- tests/asynchronous/bug601558.c-expected | 10 +++++----- tests/asynchronous/bug602594.c-expected | 10 +++++----- tests/asynchronous/bug612641.c-expected | 10 +++++----- tests/asynchronous/bug613484.c-expected | 10 +++++----- tests/asynchronous/bug614294.c-expected | 10 +++++----- tests/asynchronous/bug620740.c-expected | 10 +++++----- tests/asynchronous/bug626053.c-expected | 10 +++++----- tests/asynchronous/bug639591.c-expected | 10 +++++----- tests/asynchronous/bug640721.c-expected | 10 +++++----- tests/asynchronous/bug641182.c-expected | 10 +++++----- tests/asynchronous/bug646945.c-expected | 10 +++++----- tests/asynchronous/bug652252.c-expected | 10 +++++----- tests/asynchronous/bug653861.c-expected | 10 +++++----- tests/asynchronous/bug654336.c-expected | 10 +++++----- tests/asynchronous/bug654337.c-expected | 10 +++++----- tests/asynchronous/bug659886.c-expected | 10 +++++----- tests/asynchronous/bug661961.c-expected | 10 +++++----- tests/asynchronous/bug710103.c-expected | 10 +++++----- tests/asynchronous/bug741929.c-expected | 10 +++++----- tests/asynchronous/bug742621.c-expected | 10 +++++----- tests/asynchronous/bug762819.c-expected | 10 +++++----- tests/asynchronous/bug777242.c-expected | 10 +++++----- tests/asynchronous/bug783543.c-expected | 10 +++++----- tests/asynchronous/bug792660.c-expected | 10 +++++----- tests/asynchronous/bug792942.c-expected | 10 +++++----- tests/asynchronous/bug793158.c-expected | 10 +++++----- tests/asynchronous/captured-fixed-array.c-expected | 10 +++++----- tests/asynchronous/catch-error-scope.c-expected | 10 +++++----- tests/asynchronous/catch-in-finally.c-expected | 10 +++++----- tests/asynchronous/closures.c-expected | 10 +++++----- .../asynchronous/constructor-argument-check.c-expected | 10 +++++----- tests/asynchronous/creation-method-uncaught.c-expected | 10 +++++----- tests/asynchronous/finish-name.c-expected | 10 +++++----- tests/asynchronous/generator.c-expected | 10 +++++----- tests/asynchronous/main-block-async-call.c-expected | 10 +++++----- .../asynchronous/main-block-async-creation.c-expected | 10 +++++----- tests/asynchronous/main-block-async-yield.c-expected | 10 +++++----- tests/asynchronous/method-main-async-void.c-expected | 10 +++++----- tests/asynchronous/method-main-async.c-expected | 10 +++++----- tests/asynchronous/nowrapper.c-expected | 10 +++++----- .../out-parameter-free-on-error.c-expected | 10 +++++----- tests/asynchronous/result-pos.c-expected | 10 +++++----- tests/asynchronous/yield.c-expected | 10 +++++----- tests/basic-types/array-uint8-uchar-compat.c-expected | 10 +++++----- tests/basic-types/arrays-fixed-assignment.c-expected | 10 +++++----- tests/basic-types/arrays-generics.c-expected | 10 +++++----- tests/basic-types/arrays.c-expected | 10 +++++----- tests/basic-types/boolean-literal.c-expected | 10 +++++----- tests/basic-types/boolean.c-expected | 10 +++++----- tests/basic-types/bug571486.c-expected | 10 +++++----- tests/basic-types/bug591552.c-expected | 10 +++++----- tests/basic-types/bug595751.c-expected | 10 +++++----- tests/basic-types/bug596637.c-expected | 10 +++++----- tests/basic-types/bug596785.c-expected | 10 +++++----- tests/basic-types/bug604371.c-expected | 10 +++++----- tests/basic-types/bug610660.c-expected | 10 +++++----- tests/basic-types/bug622178.c-expected | 10 +++++----- tests/basic-types/bug632322.c-expected | 10 +++++----- tests/basic-types/bug643612.c-expected | 10 +++++----- tests/basic-types/bug644046.c-expected | 10 +++++----- tests/basic-types/bug647222.c-expected | 10 +++++----- tests/basic-types/bug648364.c-expected | 10 +++++----- tests/basic-types/bug650993.c-expected | 10 +++++----- tests/basic-types/bug652380.c-expected | 10 +++++----- tests/basic-types/bug655908.c-expected | 10 +++++----- tests/basic-types/bug659975.c-expected | 10 +++++----- tests/basic-types/bug678791.c-expected | 10 +++++----- tests/basic-types/bug686336.c-expected | 10 +++++----- tests/basic-types/bug729907.c-expected | 10 +++++----- tests/basic-types/bug731017.c-expected | 10 +++++----- tests/basic-types/bug756376.c-expected | 10 +++++----- tests/basic-types/bug761307.c-expected | 10 +++++----- tests/basic-types/bug761736.c-expected | 10 +++++----- tests/basic-types/bug772426.c-expected | 10 +++++----- tests/basic-types/bug787152.c-expected | 10 +++++----- tests/basic-types/bug788775.c-expected | 10 +++++----- tests/basic-types/custom-types.c-expected | 10 +++++----- tests/basic-types/default-gtype.c-expected | 10 +++++----- tests/basic-types/escape-chars.c-expected | 10 +++++----- tests/basic-types/float-literals.c-expected | 10 +++++----- tests/basic-types/floats-boxed-cast.c-expected | 10 +++++----- tests/basic-types/floats-hexadecimal.c-expected | 10 +++++----- tests/basic-types/floats.c-expected | 10 +++++----- tests/basic-types/garray.c-expected | 10 +++++----- tests/basic-types/gassert.c-expected | 10 +++++----- tests/basic-types/glists.c-expected | 10 +++++----- tests/basic-types/glists_remove.c-expected | 10 +++++----- tests/basic-types/gptrarray.c-expected | 10 +++++----- tests/basic-types/gvariants-unboxing-safe.c-expected | 10 +++++----- tests/basic-types/gvariants.c-expected | 10 +++++----- tests/basic-types/integer-literals.c-expected | 10 +++++----- tests/basic-types/integers-binary.c-expected | 10 +++++----- tests/basic-types/integers-boxed-cast.c-expected | 10 +++++----- tests/basic-types/integers-negative-rank.c-expected | 10 +++++----- tests/basic-types/integers-octal.c-expected | 10 +++++----- tests/basic-types/integers.c-expected | 10 +++++----- tests/basic-types/null.c-expected | 10 +++++----- tests/basic-types/pointers-arithmetic.c-expected | 10 +++++----- tests/basic-types/pointers.c-expected | 10 +++++----- tests/basic-types/sizeof.c-expected | 10 +++++----- tests/basic-types/string-array-append.c-expected | 10 +++++----- tests/basic-types/string-relation.c-expected | 10 +++++----- tests/basic-types/strings.c-expected | 10 +++++----- tests/bindings/gio/memoryoutputstream.c-expected | 10 +++++----- tests/chainup/bug791785.c-expected | 10 +++++----- tests/chainup/class-base-foo.c-expected | 10 +++++----- tests/chainup/class-base.c-expected | 10 +++++----- tests/chainup/class-compact-base.c-expected | 10 +++++----- tests/chainup/class-compact-this.c-expected | 10 +++++----- tests/chainup/class-object.c-expected | 10 +++++----- tests/chainup/class-this-foo.c-expected | 10 +++++----- tests/chainup/class-this.c-expected | 10 +++++----- tests/chainup/method-lambda-base.c-expected | 10 +++++----- tests/chainup/no-chainup.c-expected | 10 +++++----- tests/chainup/signal-default-handler.c-expected | 10 +++++----- tests/chainup/struct-base-foo.c-expected | 10 +++++----- tests/chainup/struct-base.c-expected | 10 +++++----- tests/chainup/struct-no-gtype-base.c-expected | 10 +++++----- tests/chainup/struct-simple-no-gtype-base.c-expected | 10 +++++----- tests/chainup/struct-this-foo.c-expected | 10 +++++----- tests/chainup/struct-this.c-expected | 10 +++++----- tests/constants/delegate-type.c-expected | 10 +++++----- tests/constants/glog.c-expected | 10 +++++----- tests/constants/member-access-enum.c-expected | 10 +++++----- tests/constants/member-access.c-expected | 10 +++++----- tests/constants/strings.c-expected | 10 +++++----- tests/control-flow/assigned-local-variable.c-expected | 10 +++++----- tests/control-flow/break.c-expected | 10 +++++----- tests/control-flow/bug628336.c-expected | 10 +++++----- tests/control-flow/bug639482.c-expected | 10 +++++----- tests/control-flow/bug652549.c-expected | 10 +++++----- tests/control-flow/bug661985.c-expected | 10 +++++----- tests/control-flow/bug665904.c-expected | 10 +++++----- tests/control-flow/bug691514.c-expected | 10 +++++----- tests/control-flow/bug736774-1.c-expected | 10 +++++----- tests/control-flow/bug736774-2.c-expected | 10 +++++----- tests/control-flow/bug761267-1.c-expected | 10 +++++----- tests/control-flow/bug761267-2.c-expected | 10 +++++----- tests/control-flow/bug764440.c-expected | 10 +++++----- tests/control-flow/coalesce-as-argument.c-expected | 10 +++++----- tests/control-flow/coalesce-execution-order.c-expected | 10 +++++----- .../coalesce-reference-transfer.c-expected | 10 +++++----- tests/control-flow/coalesce-right-value.c-expected | 10 +++++----- tests/control-flow/coalesce-short-circuit.c-expected | 10 +++++----- tests/control-flow/conditional-as-argument.c-expected | 10 +++++----- tests/control-flow/expressions-conditional.c-expected | 10 +++++----- tests/control-flow/finally-no-return.c-expected | 10 +++++----- tests/control-flow/for-switch-continue.c-expected | 10 +++++----- tests/control-flow/for.c-expected | 10 +++++----- tests/control-flow/foreach.c-expected | 10 +++++----- .../local-clash-with-implicit-this.c-expected | 10 +++++----- tests/control-flow/lock-if-throw.c-expected | 10 +++++----- tests/control-flow/nested-conditional.c-expected | 10 +++++----- tests/control-flow/null-conditional-bool.c-expected | 10 +++++----- .../pre-post-increment-array-index.c-expected | 10 +++++----- tests/control-flow/pre-post-increment-field.c-expected | 10 +++++----- tests/control-flow/pre-post-increment-local.c-expected | 10 +++++----- .../pre-post-increment-parameter.c-expected | 10 +++++----- .../pre-post-increment-property.c-expected | 10 +++++----- tests/control-flow/pre-post-increment.c-expected | 10 +++++----- tests/control-flow/sideeffects.c-expected | 10 +++++----- tests/control-flow/switch-enum.c-expected | 10 +++++----- tests/control-flow/switch-string.c-expected | 10 +++++----- tests/control-flow/switch.c-expected | 10 +++++----- tests/control-flow/while-false.c-expected | 10 +++++----- tests/dbus/arrays_client.c-expected | 10 +++++----- tests/dbus/arrays_server.c-expected | 10 +++++----- tests/dbus/async-bus_client.c-expected | 10 +++++----- tests/dbus/async-bus_server.c-expected | 10 +++++----- tests/dbus/async-connection_client.c-expected | 10 +++++----- tests/dbus/async-connection_server.c-expected | 10 +++++----- tests/dbus/async-errors_client.c-expected | 10 +++++----- tests/dbus/async-errors_server.c-expected | 10 +++++----- tests/dbus/async-no-reply-relay_client.c-expected | 10 +++++----- tests/dbus/async-no-reply-relay_server.c-expected | 10 +++++----- tests/dbus/async-no-reply-request_client.c-expected | 10 +++++----- tests/dbus/async-no-reply-request_server.c-expected | 10 +++++----- tests/dbus/async-no-reply-response_client.c-expected | 10 +++++----- tests/dbus/async-no-reply-response_server.c-expected | 10 +++++----- tests/dbus/async_client.c-expected | 10 +++++----- tests/dbus/async_server.c-expected | 10 +++++----- tests/dbus/basic-types_client.c-expected | 10 +++++----- tests/dbus/basic-types_server.c-expected | 10 +++++----- tests/dbus/bug596862.c-expected | 10 +++++----- tests/dbus/bug602003_client.c-expected | 10 +++++----- tests/dbus/bug602003_server.c-expected | 10 +++++----- tests/dbus/bug735437_client.c-expected | 10 +++++----- tests/dbus/bug735437_server.c-expected | 10 +++++----- tests/dbus/bug782719_client.c-expected | 10 +++++----- tests/dbus/bug782719_server.c-expected | 10 +++++----- tests/dbus/bug783002_client.c-expected | 10 +++++----- tests/dbus/bug783002_server.c-expected | 10 +++++----- tests/dbus/bug792277.c-expected | 10 +++++----- tests/dbus/connection_client.c-expected | 10 +++++----- tests/dbus/connection_server.c-expected | 10 +++++----- tests/dbus/dicts_client.c-expected | 10 +++++----- tests/dbus/dicts_server.c-expected | 10 +++++----- tests/dbus/dynamic-method_client.c-expected | 10 +++++----- tests/dbus/dynamic-method_server.c-expected | 10 +++++----- tests/dbus/enum-string-marshalling.c-expected | 10 +++++----- tests/dbus/errors_client.c-expected | 10 +++++----- tests/dbus/errors_server.c-expected | 10 +++++----- tests/dbus/filedescriptor-async_client.c-expected | 10 +++++----- tests/dbus/filedescriptor-async_server.c-expected | 10 +++++----- tests/dbus/filedescriptor-errors_client.c-expected | 10 +++++----- tests/dbus/filedescriptor-errors_server.c-expected | 10 +++++----- tests/dbus/filedescriptor_client.c-expected | 10 +++++----- tests/dbus/filedescriptor_server.c-expected | 10 +++++----- tests/dbus/generics_client.c-expected | 10 +++++----- tests/dbus/generics_server.c-expected | 10 +++++----- tests/dbus/interface-info_client.c-expected | 10 +++++----- tests/dbus/interface-info_server.c-expected | 10 +++++----- tests/dbus/no-reply_client.c-expected | 10 +++++----- tests/dbus/no-reply_server.c-expected | 10 +++++----- tests/dbus/rawvariants_client.c-expected | 10 +++++----- tests/dbus/rawvariants_server.c-expected | 10 +++++----- tests/dbus/signals_client.c-expected | 10 +++++----- tests/dbus/signals_server.c-expected | 10 +++++----- tests/dbus/structs_client.c-expected | 10 +++++----- tests/dbus/structs_server.c-expected | 10 +++++----- tests/delegates/bug539166.c-expected | 10 +++++----- tests/delegates/bug595610.c-expected | 10 +++++----- tests/delegates/bug595639.c-expected | 10 +++++----- tests/delegates/bug638415.c-expected | 10 +++++----- tests/delegates/bug639751.c-expected | 10 +++++----- tests/delegates/bug659778.c-expected | 10 +++++----- tests/delegates/bug683925.c-expected | 10 +++++----- tests/delegates/bug703804.c-expected | 10 +++++----- tests/delegates/bug761360.c-expected | 10 +++++----- tests/delegates/bug792077.c-expected | 10 +++++----- tests/delegates/casting.c-expected | 10 +++++----- tests/delegates/class-field-initializer.c-expected | 10 +++++----- tests/delegates/compatible.c-expected | 10 +++++----- tests/delegates/delegate-recusive.c-expected | 10 +++++----- tests/delegates/delegate_only.c-expected | 10 +++++----- tests/delegates/delegates.c-expected | 10 +++++----- tests/delegates/error-pos.c-expected | 10 +++++----- tests/delegates/fields-no-target.c-expected | 10 +++++----- tests/delegates/fields.c-expected | 10 +++++----- tests/delegates/gclosure-conversion.c-expected | 10 +++++----- tests/delegates/implicit-local-variable.c-expected | 10 +++++----- .../delegates/lambda-mixed-instance-static.c-expected | 10 +++++----- tests/delegates/lambda-shared-closure.c-expected | 10 +++++----- tests/delegates/member-target-destroy-2.c-expected | 10 +++++----- tests/delegates/member-target-destroy.c-expected | 10 +++++----- tests/delegates/params-array-with-throws.c-expected | 10 +++++----- tests/delegates/params-array.c-expected | 10 +++++----- tests/delegates/reference_transfer.c-expected | 10 +++++----- .../delegates/return-array-null-terminated.c-expected | 10 +++++----- tests/delegates/variadic.c-expected | 10 +++++----- tests/delegates/wrapper.c-expected | 10 +++++----- tests/enums/bug614424.c-expected | 10 +++++----- tests/enums/bug666035.c-expected | 10 +++++----- tests/enums/bug673879.c-expected | 10 +++++----- tests/enums/bug763831.c-expected | 10 +++++----- tests/enums/bug780050.c-expected | 10 +++++----- tests/enums/default-gtype.c-expected | 10 +++++----- tests/enums/enum-boxed.c-expected | 10 +++++----- tests/enums/enum-no-gtype.c-expected | 10 +++++----- tests/enums/enum_only.c-expected | 10 +++++----- tests/enums/enums.c-expected | 10 +++++----- tests/enums/flags.c-expected | 10 +++++----- tests/enums/from-0-literal.c-expected | 10 +++++----- tests/enums/in-inference.c-expected | 10 +++++----- tests/enums/no_gtype_to_string.c-expected | 10 +++++----- tests/enums/switch.c-expected | 10 +++++----- tests/enums/unsafe-assignment.c-expected | 10 +++++----- tests/errors/bug567181.c-expected | 10 +++++----- tests/errors/bug579101.c-expected | 10 +++++----- tests/errors/bug596228.c-expected | 10 +++++----- tests/errors/bug623049.c-expected | 10 +++++----- tests/errors/bug627090.c-expected | 10 +++++----- tests/errors/bug639589.c-expected | 10 +++++----- tests/errors/bug651145.c-expected | 10 +++++----- tests/errors/bug762377.c-expected | 10 +++++----- tests/errors/bug778224.c-expected | 10 +++++----- tests/errors/catch-error-code.c-expected | 10 +++++----- tests/errors/catch-in-finally.c-expected | 10 +++++----- tests/errors/default-gtype.c-expected | 10 +++++----- tests/errors/delegate-throws-error-code.c-expected | 10 +++++----- tests/errors/errorcode.c-expected | 10 +++++----- tests/errors/errordomain-static-method.c-expected | 10 +++++----- tests/errors/errordomain.c-expected | 10 +++++----- tests/errors/errors.c-expected | 10 +++++----- tests/errors/loops.c-expected | 10 +++++----- tests/errors/method-throws-error-code.c-expected | 10 +++++----- tests/errors/method-throws.c-expected | 10 +++++----- tests/errors/unhandled.c-expected | 10 +++++----- tests/generics/arrays.c-expected | 10 +++++----- tests/generics/bug640330.c-expected | 10 +++++----- tests/generics/bug694765-1.c-expected | 10 +++++----- tests/generics/bug694765-2.c-expected | 10 +++++----- tests/generics/bug694765-3.c-expected | 10 +++++----- tests/generics/class-property-override.c-expected | 10 +++++----- tests/generics/constructor-chain-up.c-expected | 10 +++++----- tests/generics/floating-type-cast.c-expected | 10 +++++----- tests/generics/foreach-iterator-nullable.c-expected | 10 +++++----- .../generics/inference-argument-may-fail-2.c-expected | 10 +++++----- tests/generics/inference-argument-may-fail.c-expected | 10 +++++----- tests/generics/inference-static-function.c-expected | 10 +++++----- tests/generics/integer-member-access.c-expected | 10 +++++----- tests/generics/integer-type-cast-return.c-expected | 10 +++++----- tests/generics/integer-type-cast.c-expected | 10 +++++----- tests/generics/interface-property-impl.c-expected | 10 +++++----- tests/generics/member-dup-destroy.c-expected | 10 +++++----- tests/generics/method-return-cast.c-expected | 10 +++++----- tests/generics/method-to-delegate-2.c-expected | 10 +++++----- tests/generics/method-to-delegate.c-expected | 10 +++++----- tests/generics/null-type.c-expected | 10 +++++----- tests/generics/parameter-in-cast.c-expected | 10 +++++----- tests/generics/parameter-out-cast.c-expected | 10 +++++----- .../generics/parameter-sizeof-initializer-2.c-expected | 10 +++++----- tests/generics/parameter-sizeof-initializer.c-expected | 10 +++++----- tests/generics/parameter-typeof-initializer.c-expected | 10 +++++----- tests/generics/parameter-typeof.c-expected | 10 +++++----- tests/generics/property-gobject-set.c-expected | 10 +++++----- tests/generics/property-int-cast.c-expected | 10 +++++----- tests/generics/reference-transfer.c-expected | 10 +++++----- tests/generics/string-literal-comparison.c-expected | 10 +++++----- tests/generics/type-parameter-properties.c-expected | 10 +++++----- .../generics/type-parameter-property-clash.c-expected | 10 +++++----- tests/generics/value-pointer-type-access.c-expected | 10 +++++----- tests/genie/attributes.c-expected | 10 +++++----- tests/genie/case.c-expected | 10 +++++----- tests/genie/class-abstract.c-expected | 10 +++++----- tests/genie/class-field.c-expected | 10 +++++----- tests/genie/class-init.c-expected | 10 +++++----- tests/genie/class-property.c-expected | 10 +++++----- tests/genie/class-signal.c-expected | 10 +++++----- tests/genie/class.c-expected | 10 +++++----- tests/genie/constant.c-expected | 10 +++++----- tests/genie/control-flow-if-do.c-expected | 10 +++++----- tests/genie/control-flow-if-else-if.c-expected | 10 +++++----- tests/genie/control-flow-if-else.c-expected | 10 +++++----- tests/genie/control-flow-if-greater-than.c-expected | 10 +++++----- tests/genie/control-flow-if-identity.c-expected | 10 +++++----- tests/genie/control-flow-if-less-than.c-expected | 10 +++++----- tests/genie/control-flow-if.c-expected | 10 +++++----- tests/genie/do-while.c-expected | 10 +++++----- tests/genie/enum-with-keyword-values.c-expected | 10 +++++----- tests/genie/enum.c-expected | 10 +++++----- tests/genie/exception.c-expected | 10 +++++----- tests/genie/for-downto.c-expected | 10 +++++----- tests/genie/for-in.c-expected | 10 +++++----- tests/genie/for-to.c-expected | 10 +++++----- tests/genie/function-returns-closure.c-expected | 10 +++++----- tests/genie/function-with-argument.c-expected | 10 +++++----- tests/genie/function-with-return-value.c-expected | 10 +++++----- tests/genie/function.c-expected | 10 +++++----- tests/genie/indentation-with-spaces.c-expected | 10 +++++----- tests/genie/init-int.c-expected | 10 +++++----- tests/genie/init.c-expected | 10 +++++----- tests/genie/initializer-list.c-expected | 10 +++++----- tests/genie/interface.c-expected | 10 +++++----- tests/genie/literal-boolean-assignment.c-expected | 10 +++++----- tests/genie/literal-boolean.c-expected | 10 +++++----- tests/genie/literal-character.c-expected | 10 +++++----- tests/genie/literal-hexadecimal.c-expected | 10 +++++----- .../genie/literal-integer-long-long-suffix.c-expected | 10 +++++----- tests/genie/literal-integer.c-expected | 10 +++++----- tests/genie/literal-null.c-expected | 10 +++++----- tests/genie/literal-octal.c-expected | 10 +++++----- tests/genie/literal-real.c-expected | 10 +++++----- tests/genie/literal-regex.c-expected | 10 +++++----- tests/genie/literal-template-string.c-expected | 10 +++++----- tests/genie/literal-verbatim-string.c-expected | 10 +++++----- tests/genie/operator-addition.c-expected | 10 +++++----- tests/genie/operator-assignment-combined.c-expected | 10 +++++----- tests/genie/operator-assignment.c-expected | 10 +++++----- tests/genie/operator-bitwise-and.c-expected | 10 +++++----- tests/genie/operator-bitwise-left-shift.c-expected | 10 +++++----- tests/genie/operator-bitwise-not.c-expected | 10 +++++----- tests/genie/operator-bitwise-or.c-expected | 10 +++++----- tests/genie/operator-bitwise-right-shift.c-expected | 10 +++++----- tests/genie/operator-bitwise-xor.c-expected | 10 +++++----- tests/genie/operator-division.c-expected | 10 +++++----- tests/genie/operator-equal.c-expected | 10 +++++----- tests/genie/operator-greater-than-equal.c-expected | 10 +++++----- tests/genie/operator-less-than-equal.c-expected | 10 +++++----- tests/genie/operator-less-than.c-expected | 10 +++++----- tests/genie/operator-logical-and.c-expected | 10 +++++----- tests/genie/operator-logical-not.c-expected | 10 +++++----- tests/genie/operator-logical-or.c-expected | 10 +++++----- tests/genie/operator-modulo.c-expected | 10 +++++----- tests/genie/operator-multiply.c-expected | 10 +++++----- tests/genie/operator-not-equal.c-expected | 10 +++++----- tests/genie/operator-post-decrement.c-expected | 10 +++++----- tests/genie/operator-post-increment.c-expected | 10 +++++----- tests/genie/operator-pre-decrement.c-expected | 10 +++++----- tests/genie/operator-pre-increment.c-expected | 10 +++++----- tests/genie/operator-subtraction.c-expected | 10 +++++----- tests/genie/operator-ternary.c-expected | 10 +++++----- tests/genie/operators-greater-than.c-expected | 10 +++++----- tests/genie/preparser-and-expression.c-expected | 10 +++++----- tests/genie/preparser-elif.c-expected | 10 +++++----- tests/genie/preparser-equality-expression.c-expected | 10 +++++----- tests/genie/preparser-not.c-expected | 10 +++++----- tests/genie/preparser-or-expression.c-expected | 10 +++++----- tests/genie/preparser.c-expected | 10 +++++----- tests/genie/print.c-expected | 10 +++++----- tests/genie/sizeof.c-expected | 10 +++++----- tests/genie/struct-after-class.c-expected | 10 +++++----- tests/genie/struct.c-expected | 10 +++++----- tests/genie/try-except-finally.c-expected | 10 +++++----- tests/genie/typeof.c-expected | 10 +++++----- tests/genie/verbatim-template.c-expected | 10 +++++----- tests/genie/while.c-expected | 10 +++++----- tests/headers/sealed-class.c-expected | 10 +++++----- tests/linux/bug793444.c-expected | 10 +++++----- tests/linux/file-commandpipe.c-expected | 10 +++++----- tests/methods/argument-array-initilizer.c-expected | 10 +++++----- tests/methods/argument-named.c-expected | 10 +++++----- tests/methods/array-length-type.c-expected | 10 +++++----- tests/methods/bug540483.c-expected | 10 +++++----- tests/methods/bug595538.c-expected | 10 +++++----- tests/methods/bug596726.c-expected | 10 +++++----- tests/methods/bug597426.c-expected | 10 +++++----- tests/methods/bug598738.c-expected | 10 +++++----- tests/methods/bug599892.c-expected | 10 +++++----- tests/methods/bug613483.c-expected | 10 +++++----- tests/methods/bug620673.c-expected | 10 +++++----- tests/methods/bug622570.c-expected | 10 +++++----- tests/methods/bug626783.c-expected | 10 +++++----- tests/methods/bug634753.c-expected | 10 +++++----- tests/methods/bug639054.c-expected | 10 +++++----- tests/methods/bug642350.c-expected | 10 +++++----- tests/methods/bug642885.c-expected | 10 +++++----- tests/methods/bug642899.c-expected | 10 +++++----- tests/methods/bug646345.c-expected | 10 +++++----- tests/methods/bug648320.c-expected | 10 +++++----- tests/methods/bug649562.c-expected | 10 +++++----- tests/methods/bug652098.c-expected | 10 +++++----- tests/methods/bug653391.c-expected | 10 +++++----- tests/methods/bug653908.c-expected | 10 +++++----- tests/methods/bug663210.c-expected | 10 +++++----- tests/methods/bug699956.c-expected | 10 +++++----- tests/methods/bug710862.c-expected | 10 +++++----- tests/methods/bug723009.c-expected | 10 +++++----- tests/methods/bug723195.c-expected | 10 +++++----- tests/methods/bug726347.c-expected | 10 +++++----- tests/methods/bug736235.c-expected | 10 +++++----- tests/methods/bug737222.c-expected | 10 +++++----- tests/methods/bug743877.c-expected | 10 +++++----- tests/methods/bug771964.c-expected | 10 +++++----- tests/methods/bug774060.c-expected | 10 +++++----- tests/methods/bug781061.c-expected | 10 +++++----- tests/methods/bug784691.c-expected | 10 +++++----- tests/methods/bug791215.c-expected | 10 +++++----- tests/methods/bug791283.c-expected | 10 +++++----- tests/methods/closures.c-expected | 10 +++++----- tests/methods/contains.c-expected | 10 +++++----- tests/methods/delegate-target.c-expected | 10 +++++----- tests/methods/extern.c-expected | 10 +++++----- tests/methods/generics.c-expected | 10 +++++----- tests/methods/iterator.c-expected | 10 +++++----- tests/methods/lambda.c-expected | 10 +++++----- tests/methods/local-functions.c-expected | 10 +++++----- tests/methods/nowrapper-interface.c-expected | 10 +++++----- tests/methods/parameter-ccode-type.c-expected | 10 +++++----- .../parameter-fixed-array-initializer.c-expected | 10 +++++----- tests/methods/parameter-out-free-on-error.c-expected | 10 +++++----- .../parameter-ref-array-resize-captured.c-expected | 10 +++++----- tests/methods/parameter-ref-array-resize.c-expected | 10 +++++----- tests/methods/parameter-ref-delegate.c-expected | 10 +++++----- tests/methods/parameter-ref-element-access.c-expected | 10 +++++----- tests/methods/params-array-with-throws.c-expected | 10 +++++----- tests/methods/params-array.c-expected | 10 +++++----- tests/methods/postconditions-temp-variables.c-expected | 10 +++++----- tests/methods/postconditions.c-expected | 10 +++++----- tests/methods/preconditions-temp-variables.c-expected | 10 +++++----- tests/methods/prepostconditions-captured.c-expected | 10 +++++----- tests/methods/prepostconditions-contains.c-expected | 10 +++++----- tests/methods/prepostconditions.c-expected | 10 +++++----- tests/methods/print-attribute.c-expected | 10 +++++----- tests/methods/printf-constructor.c-expected | 10 +++++----- tests/methods/profile.c-expected | 10 +++++----- tests/methods/return-unowned-delegate.c-expected | 10 +++++----- tests/methods/same-name.c-expected | 10 +++++----- tests/methods/symbolresolution.c-expected | 10 +++++----- .../methods/varargs-delegate-without-target.c-expected | 10 +++++----- tests/methods/varargs-delegate.c-expected | 10 +++++----- tests/methods/varargs-gvalue.c-expected | 10 +++++----- tests/methods/varargs-out.c-expected | 10 +++++----- tests/methods/varargs-ref.c-expected | 10 +++++----- tests/methods/varargs-struct.c-expected | 10 +++++----- tests/namespace/unique.c-expected | 10 +++++----- tests/nullability/array-element-class.c-expected | 10 +++++----- tests/nullability/array-element-string.c-expected | 10 +++++----- tests/nullability/bug611223.c-expected | 10 +++++----- tests/nullability/generics.c-expected | 10 +++++----- .../member-access-narrowed-instance.c-expected | 10 +++++----- tests/nullability/var-type.c-expected | 10 +++++----- tests/objects/bug566909.c-expected | 10 +++++----- tests/objects/bug588203.c-expected | 10 +++++----- tests/objects/bug589928.c-expected | 10 +++++----- tests/objects/bug593137.c-expected | 10 +++++----- tests/objects/bug593260.c-expected | 10 +++++----- tests/objects/bug596621.c-expected | 10 +++++----- tests/objects/bug597155.c-expected | 10 +++++----- tests/objects/bug597161.c-expected | 10 +++++----- tests/objects/bug613486.c-expected | 10 +++++----- tests/objects/bug613840.c-expected | 10 +++++----- tests/objects/bug620675.c-expected | 10 +++++----- tests/objects/bug620706.c-expected | 10 +++++----- tests/objects/bug624594.c-expected | 10 +++++----- tests/objects/bug626038-2.c-expected | 10 +++++----- tests/objects/bug626038.c-expected | 10 +++++----- tests/objects/bug628639.c-expected | 10 +++++----- tests/objects/bug629593.c-expected | 10 +++++----- tests/objects/bug631267.c-expected | 10 +++++----- tests/objects/bug634782.c-expected | 10 +++++----- tests/objects/bug641828.c-expected | 10 +++++----- tests/objects/bug642809.c-expected | 10 +++++----- tests/objects/bug643711.c-expected | 10 +++++----- tests/objects/bug644938.c-expected | 10 +++++----- tests/objects/bug646362.c-expected | 10 +++++----- tests/objects/bug646792.c-expected | 10 +++++----- tests/objects/bug647018.c-expected | 10 +++++----- tests/objects/bug653138.c-expected | 10 +++++----- tests/objects/bug654702.c-expected | 10 +++++----- tests/objects/bug663134.c-expected | 10 +++++----- tests/objects/bug664529.c-expected | 10 +++++----- tests/objects/bug681356.c-expected | 10 +++++----- tests/objects/bug683646.c-expected | 10 +++++----- tests/objects/bug695671.c-expected | 10 +++++----- tests/objects/bug702736.c-expected | 10 +++++----- tests/objects/bug702846.c-expected | 10 +++++----- tests/objects/bug731547.c-expected | 10 +++++----- tests/objects/bug741465.c-expected | 10 +++++----- tests/objects/bug751338.c-expected | 10 +++++----- tests/objects/bug758816.c-expected | 10 +++++----- tests/objects/bug764481.c-expected | 10 +++++----- tests/objects/bug766739.c-expected | 10 +++++----- tests/objects/bug778632.c-expected | 10 +++++----- tests/objects/bug779219.c-expected | 10 +++++----- tests/objects/bug779955.c-expected | 10 +++++----- tests/objects/bug783897.c-expected | 10 +++++----- tests/objects/bug788964.c-expected | 10 +++++----- tests/objects/bug795521.c-expected | 10 +++++----- tests/objects/chainup.c-expected | 10 +++++----- tests/objects/class-ccode-cprefix.c-expected | 10 +++++----- tests/objects/class-destroysinstance.c-expected | 10 +++++----- tests/objects/class-inner-types.c-expected | 10 +++++----- tests/objects/class-new-no-override.c-expected | 10 +++++----- tests/objects/class-partial-nested.c-expected | 10 +++++----- tests/objects/class-partial.c-expected | 10 +++++----- tests/objects/class-ref-void.c-expected | 10 +++++----- tests/objects/class-vfunc-base-access.c-expected | 10 +++++----- tests/objects/class_only.c-expected | 10 +++++----- .../objects/classes-implicit-implementation.c-expected | 10 +++++----- tests/objects/classes-interfaces-virtuals.c-expected | 10 +++++----- tests/objects/classes-interfaces.c-expected | 10 +++++----- tests/objects/classes.c-expected | 10 +++++----- tests/objects/compact-class-custom-ref.c-expected | 10 +++++----- tests/objects/compact-class-destructor.c-expected | 10 +++++----- tests/objects/compact-class-refcount.c-expected | 10 +++++----- tests/objects/compact-class.c-expected | 10 +++++----- tests/objects/constructor-inner-error.c-expected | 10 +++++----- tests/objects/constructor-variadic.c-expected | 10 +++++----- tests/objects/constructors.c-expected | 10 +++++----- tests/objects/destructors.c-expected | 10 +++++----- tests/objects/dynamic.c-expected | 10 +++++----- tests/objects/fields.c-expected | 10 +++++----- tests/objects/generics.c-expected | 10 +++++----- tests/objects/gobject-class-lifetime.c-expected | 10 +++++----- tests/objects/gsource.c-expected | 10 +++++----- tests/objects/gtype-class-lifetime.c-expected | 10 +++++----- tests/objects/initially-unowned.c-expected | 10 +++++----- tests/objects/instance-comparison.c-expected | 10 +++++----- .../interface-abstract-async-override.c-expected | 10 +++++----- tests/objects/interface-async-base-access.c-expected | 10 +++++----- .../interface-async-captured-generic.c-expected | 10 +++++----- tests/objects/interface-base-access.c-expected | 10 +++++----- tests/objects/interface-generics.c-expected | 10 +++++----- tests/objects/interface-inner-types.c-expected | 10 +++++----- tests/objects/interface-parameter-nowrapper.c-expected | 10 +++++----- .../objects/interface-property-base-access.c-expected | 10 +++++----- tests/objects/interface-property-base-impl.c-expected | 10 +++++----- tests/objects/interface-property-delegate.c-expected | 10 +++++----- tests/objects/interface-property-override.c-expected | 10 +++++----- tests/objects/interface-virtual-override.c-expected | 10 +++++----- tests/objects/interface_only.c-expected | 10 +++++----- tests/objects/interfaces.c-expected | 10 +++++----- .../member-initializer-base-properties.c-expected | 10 +++++----- tests/objects/member-initializer-chained-2.c-expected | 10 +++++----- tests/objects/member-initializer-chained.c-expected | 10 +++++----- tests/objects/member-initializer-private.c-expected | 10 +++++----- ...member-initializer-property-owned-setter.c-expected | 10 +++++----- tests/objects/member-initializer-property.c-expected | 10 +++++----- tests/objects/member-initializer-protected.c-expected | 10 +++++----- tests/objects/methods.c-expected | 10 +++++----- tests/objects/paramspec.c-expected | 10 +++++----- tests/objects/plugin-module-init.c-expected | 10 +++++----- tests/objects/properties.c-expected | 10 +++++----- tests/objects/property-array-length.c-expected | 10 +++++----- tests/objects/property-array.c-expected | 10 +++++----- tests/objects/property-base-access.c-expected | 10 +++++----- tests/objects/property-construct-only.c-expected | 10 +++++----- tests/objects/property-delegate-owned.c-expected | 10 +++++----- tests/objects/property-delegate.c-expected | 10 +++++----- .../objects/property-dynamic-type-inference.c-expected | 10 +++++----- tests/objects/property-enum-nullable.c-expected | 10 +++++----- tests/objects/property-enum.c-expected | 10 +++++----- tests/objects/property-error.c-expected | 10 +++++----- tests/objects/property-gboxed-nullable.c-expected | 10 +++++----- tests/objects/property-notify-owned-getter.c-expected | 10 +++++----- tests/objects/property-notify.c-expected | 10 +++++----- tests/objects/property-ownership.c-expected | 10 +++++----- tests/objects/property-read-only-auto.c-expected | 10 +++++----- .../objects/property-real-struct-assignment.c-expected | 10 +++++----- .../property-simple-type-struct-nullable.c-expected | 10 +++++----- tests/objects/property-static.c-expected | 10 +++++----- tests/objects/property-struct-no-gtype.c-expected | 10 +++++----- tests/objects/property-struct.c-expected | 10 +++++----- tests/objects/property-strv-noaccessor.c-expected | 10 +++++----- tests/objects/regex.c-expected | 10 +++++----- tests/objects/signals-default-class-handler.c-expected | 10 +++++----- tests/objects/signals-delegate-parameter.c-expected | 10 +++++----- tests/objects/signals-delegate.c-expected | 10 +++++----- tests/objects/signals-dynamic-emit.c-expected | 10 +++++----- tests/objects/signals-emit.c-expected | 10 +++++----- tests/objects/signals-enum-marshal.c-expected | 10 +++++----- tests/objects/signals-error-marshal.c-expected | 10 +++++----- tests/objects/signals-fundamental-return.c-expected | 10 +++++----- tests/objects/signals-generic-return.c-expected | 10 +++++----- tests/objects/signals-gobject-return.c-expected | 10 +++++----- tests/objects/signals-lambda-delegate-2.c-expected | 10 +++++----- tests/objects/signals-lambda-delegate.c-expected | 10 +++++----- tests/objects/signals-prototype-access.c-expected | 10 +++++----- tests/objects/signals-struct-return.c-expected | 10 +++++----- tests/objects/signals-struct.c-expected | 10 +++++----- tests/objects/signals.c-expected | 10 +++++----- tests/objects/simple-generics-chainup.c-expected | 10 +++++----- tests/objects/singleton.c-expected | 10 +++++----- tests/objects/test-025.c-expected | 10 +++++----- tests/objects/test-026.c-expected | 10 +++++----- tests/objects/test-029.c-expected | 10 +++++----- tests/objects/test-034.c-expected | 10 +++++----- .../objects/type-narrowing-by-precondition.c-expected | 10 +++++----- tests/objects/type-narrowing-fallback.c-expected | 10 +++++----- tests/objects/type-narrowing.c-expected | 10 +++++----- tests/objects/with-expression.c-expected | 10 +++++----- tests/objects/with-instance.c-expected | 10 +++++----- tests/objects/with-nested-in-lambda.c-expected | 10 +++++----- tests/objects/with-nested-method.c-expected | 10 +++++----- tests/objects/with-nested-signal.c-expected | 10 +++++----- tests/objects/with-nested-unambigous-signal.c-expected | 10 +++++----- tests/objects/with-nested.c-expected | 10 +++++----- tests/ordering/constant-class.c-expected | 10 +++++----- tests/ordering/constant-constant.c-expected | 10 +++++----- tests/ordering/constant-enum.c-expected | 10 +++++----- tests/ordering/constant-field.c-expected | 10 +++++----- tests/ordering/constant-struct.c-expected | 10 +++++----- tests/ordering/delegate-class.c-expected | 10 +++++----- tests/ordering/delegate-enum.c-expected | 10 +++++----- tests/ordering/delegate-interface.c-expected | 10 +++++----- tests/ordering/delegate-struct.c-expected | 10 +++++----- tests/ordering/struct-delegate.c-expected | 10 +++++----- tests/parser-keep-going/member-initializer.c-expected | 10 +++++----- tests/parser/array-length.c-expected | 10 +++++----- tests/parser/assignment.c-expected | 10 +++++----- tests/parser/bug728574.c-expected | 10 +++++----- tests/parser/bug749576.c-expected | 10 +++++----- tests/parser/chained-equality.c-expected | 10 +++++----- tests/parser/continue-statement.c-expected | 10 +++++----- tests/parser/do-statement.c-expected | 10 +++++----- tests/parser/field-multi-one-line.c-expected | 10 +++++----- tests/parser/foreach.c-expected | 10 +++++----- tests/parser/local-variable-multi-one-line.c-expected | 10 +++++----- tests/parser/local-variable.c-expected | 10 +++++----- tests/parser/lock-statement.c-expected | 10 +++++----- tests/parser/main-block-minimal.c-expected | 10 +++++----- tests/parser/main-block.c-expected | 10 +++++----- tests/parser/member-access-pointer.c-expected | 10 +++++----- tests/parser/member-initializer-empty.c-expected | 10 +++++----- .../member-initializer-trailing-comma.c-expected | 10 +++++----- tests/parser/member-initializer.c-expected | 10 +++++----- tests/parser/namespaces.c-expected | 10 +++++----- tests/parser/preprocessor-glib.c-expected | 10 +++++----- tests/parser/preprocessor-vala.c-expected | 10 +++++----- tests/parser/preprocessor.c-expected | 10 +++++----- tests/parser/qualified-member-access.c-expected | 10 +++++----- tests/parser/qualified-symbol-access.c-expected | 10 +++++----- tests/parser/sealed-class.c-expected | 10 +++++----- .../parser/statement-keyword-as-identifier.c-expected | 10 +++++----- tests/parser/switch-statement.c-expected | 10 +++++----- tests/parser/template.c-expected | 10 +++++----- tests/parser/tuple.c-expected | 10 +++++----- tests/parser/using-directive.c-expected | 10 +++++----- tests/parser/var-type-dynamic.c-expected | 10 +++++----- tests/parser/var-type-nullable.c-expected | 10 +++++----- tests/parser/verbatim-template.c-expected | 10 +++++----- tests/parser/with-embedded.c-expected | 10 +++++----- tests/parser/with-empty.c-expected | 10 +++++----- tests/parser/yield-return.c-expected | 10 +++++----- tests/pointers/bug590641.c-expected | 10 +++++----- tests/pointers/delete.c-expected | 10 +++++----- tests/posix/arrays.c-expected | 10 +++++----- tests/posix/delegate_only.c-expected | 10 +++++----- tests/posix/empty-length-0.c-expected | 10 +++++----- tests/posix/enum-to-string.c-expected | 10 +++++----- tests/posix/enum_only.c-expected | 10 +++++----- tests/posix/string-concat.c-expected | 10 +++++----- tests/posix/string-printf.c-expected | 10 +++++----- tests/posix/struct_only.c-expected | 10 +++++----- tests/resolver/peek-inner-types.c-expected | 10 +++++----- tests/scanner/regex-escape-x.c-expected | 10 +++++----- tests/scanner/string-escape-x.c-expected | 10 +++++----- tests/scanner/string-template.c-expected | 10 +++++----- tests/scanner/string-verbatim-template.c-expected | 10 +++++----- .../assignment-element-getter-setter.c-expected | 10 +++++----- tests/semantic/assignment-same-variable.c-expected | 10 +++++----- .../class-opaque-automatic-property.c-expected | 10 +++++----- tests/semantic/class-opaque.c-expected | 10 +++++----- tests/semantic/compare-type-check.c-expected | 10 +++++----- tests/semantic/field-constant.c-expected | 10 +++++----- .../semantic/floating-reference-base-method.c-expected | 10 +++++----- tests/semantic/floating-reference-error.c-expected | 10 +++++----- tests/semantic/floating-reference.c-expected | 10 +++++----- .../localvariable-var-pointer-initializer.c-expected | 10 +++++----- ...mber-access-static-transformed-qualified.c-expected | 10 +++++----- .../member-access-static-with-instance.c-expected | 10 +++++----- .../member-access-transformed-qualified.c-expected | 10 +++++----- .../semantic/unary-ref-in-initializer-list.c-expected | 10 +++++----- .../unary-ref-in-member-initializer.c-expected | 10 +++++----- tests/semantic/with-buildin.c-expected | 10 +++++----- tests/semantic/with-compact.c-expected | 10 +++++----- tests/semantic/with-declaration-cast-type.c-expected | 10 +++++----- tests/semantic/with-declaration.c-expected | 10 +++++----- tests/semantic/with-dereferenced-pointer.c-expected | 10 +++++----- tests/semantic/with-enum-member.c-expected | 10 +++++----- tests/semantic/with-null.c-expected | 10 +++++----- tests/semantic/with-string.c-expected | 10 +++++----- tests/semantic/with-value.c-expected | 10 +++++----- tests/structs/bug530605.c-expected | 10 +++++----- tests/structs/bug572091.c-expected | 10 +++++----- tests/structs/bug583603.c-expected | 10 +++++----- tests/structs/bug595587.c-expected | 10 +++++----- tests/structs/bug596144.c-expected | 10 +++++----- tests/structs/bug603056.c-expected | 10 +++++----- tests/structs/bug606202.c-expected | 10 +++++----- tests/structs/bug609642.c-expected | 10 +++++----- tests/structs/bug613513.c-expected | 10 +++++----- tests/structs/bug613825.c-expected | 10 +++++----- tests/structs/bug621176.c-expected | 10 +++++----- tests/structs/bug622422.c-expected | 10 +++++----- tests/structs/bug623092.c-expected | 10 +++++----- tests/structs/bug651441.c-expected | 10 +++++----- tests/structs/bug654646.c-expected | 10 +++++----- tests/structs/bug654753.c-expected | 10 +++++----- tests/structs/bug656693.c-expected | 10 +++++----- tests/structs/bug657378.c-expected | 10 +++++----- tests/structs/bug658048.c-expected | 10 +++++----- tests/structs/bug660426.c-expected | 10 +++++----- tests/structs/bug661945.c-expected | 10 +++++----- tests/structs/bug667890.c-expected | 10 +++++----- tests/structs/bug669580.c-expected | 10 +++++----- tests/structs/bug685177.c-expected | 10 +++++----- tests/structs/bug686190.c-expected | 10 +++++----- tests/structs/bug688732.c-expected | 10 +++++----- tests/structs/bug690380.c-expected | 10 +++++----- tests/structs/bug694140.c-expected | 10 +++++----- tests/structs/bug749952.c-expected | 10 +++++----- tests/structs/bug775761.c-expected | 10 +++++----- tests/structs/bug777194-2.c-expected | 10 +++++----- tests/structs/bug777194.c-expected | 10 +++++----- tests/structs/cast-struct-boxed.c-expected | 10 +++++----- tests/structs/constructor-params-array.c-expected | 10 +++++----- tests/structs/constructor-variadic.c-expected | 10 +++++----- tests/structs/default-gtype.c-expected | 10 +++++----- tests/structs/gmutex.c-expected | 10 +++++----- tests/structs/gtype-base-struct.c-expected | 10 +++++----- tests/structs/gvalue-implicit-comparison.c-expected | 10 +++++----- tests/structs/gvalue.c-expected | 10 +++++----- .../namespace-field-nested-initializer.c-expected | 10 +++++----- tests/structs/properties.c-expected | 10 +++++----- tests/structs/simple-type-boxed.c-expected | 10 +++++----- tests/structs/simple-type-constructor.c-expected | 10 +++++----- tests/structs/struct-base-types.c-expected | 10 +++++----- tests/structs/struct-boxed-cast.c-expected | 10 +++++----- .../struct-initializer-list-in-array.c-expected | 10 +++++----- .../structs/struct-initializer-list-nested.c-expected | 10 +++++----- tests/structs/struct-no-gtype-inherit.c-expected | 10 +++++----- tests/structs/struct-no-gtype.c-expected | 10 +++++----- .../struct-static-field-initializer-3.c-expected | 10 +++++----- .../structs/struct-static-field-initializer.c-expected | 10 +++++----- tests/structs/struct_only.c-expected | 10 +++++----- tests/structs/structs.c-expected | 10 +++++----- tests/threads/threadpool.c-expected | 10 +++++----- 831 files changed, 4155 insertions(+), 4155 deletions(-) diff --git a/tests/annotations/deprecated-delegate-minimal.c-expected b/tests/annotations/deprecated-delegate-minimal.c-expected index 3760f1d42..07c87058e 100644 --- a/tests/annotations/deprecated-delegate-minimal.c-expected +++ b/tests/annotations/deprecated-delegate-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef void (*Foo) (void) G_GNUC_DEPRECATED ; diff --git a/tests/annotations/deprecated-enum-minimal.c-expected b/tests/annotations/deprecated-enum-minimal.c-expected index 420a0c252..cbf4fa999 100644 --- a/tests/annotations/deprecated-enum-minimal.c-expected +++ b/tests/annotations/deprecated-enum-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/annotations/deprecated-method-minimal.c-expected b/tests/annotations/deprecated-method-minimal.c-expected index 8633be84a..a56eb273a 100644 --- a/tests/annotations/deprecated-method-minimal.c-expected +++ b/tests/annotations/deprecated-method-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/annotations/deprecated-property-minimal.c-expected b/tests/annotations/deprecated-property-minimal.c-expected index 911c46d49..3c398e13c 100644 --- a/tests/annotations/deprecated-property-minimal.c-expected +++ b/tests/annotations/deprecated-property-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/annotations/deprecated-struct-minimal.c-expected b/tests/annotations/deprecated-struct-minimal.c-expected index 9459077ff..3f1e233bf 100644 --- a/tests/annotations/deprecated-struct-minimal.c-expected +++ b/tests/annotations/deprecated-struct-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _Foo Foo; diff --git a/tests/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected index 0dc25083b..c3f198ab1 100644 --- a/tests/annotations/deprecated.c-expected +++ b/tests/annotations/deprecated.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/annotations/description.c-expected b/tests/annotations/description.c-expected index f2ce2a0b4..40075b9f8 100644 --- a/tests/annotations/description.c-expected +++ b/tests/annotations/description.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/cast-struct-boxed-element-access.c-expected b/tests/arrays/cast-struct-boxed-element-access.c-expected index b7db1027f..3f931e1fd 100644 --- a/tests/arrays/cast-struct-boxed-element-access.c-expected +++ b/tests/arrays/cast-struct-boxed-element-access.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/class-field-fixed-length-initializer.c-expected b/tests/arrays/class-field-fixed-length-initializer.c-expected index ce851cbe5..f7d99d54c 100644 --- a/tests/arrays/class-field-fixed-length-initializer.c-expected +++ b/tests/arrays/class-field-fixed-length-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/class-field-initializer.c-expected b/tests/arrays/class-field-initializer.c-expected index 8da1ebe31..e40f9562b 100644 --- a/tests/arrays/class-field-initializer.c-expected +++ b/tests/arrays/class-field-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/class-field-length-cname.c-expected b/tests/arrays/class-field-length-cname.c-expected index 662f5cd05..bcc539646 100644 --- a/tests/arrays/class-field-length-cname.c-expected +++ b/tests/arrays/class-field-length-cname.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/constant-element-access.c-expected b/tests/arrays/constant-element-access.c-expected index ffbc6063d..addaeab09 100644 --- a/tests/arrays/constant-element-access.c-expected +++ b/tests/arrays/constant-element-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/element-class-assignment.c-expected b/tests/arrays/element-class-assignment.c-expected index 4c81e7d4c..4a0b5d1a6 100644 --- a/tests/arrays/element-class-assignment.c-expected +++ b/tests/arrays/element-class-assignment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/element-nullable-assignment.c-expected b/tests/arrays/element-nullable-assignment.c-expected index 19f5a76cf..2a55c787d 100644 --- a/tests/arrays/element-nullable-assignment.c-expected +++ b/tests/arrays/element-nullable-assignment.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/arrays/empty-length-0.c-expected b/tests/arrays/empty-length-0.c-expected index ff114e0a7..19c2f0b4c 100644 --- a/tests/arrays/empty-length-0.c-expected +++ b/tests/arrays/empty-length-0.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/field-global-length-cname.c-expected b/tests/arrays/field-global-length-cname.c-expected index db4b902ee..c2667399b 100644 --- a/tests/arrays/field-global-length-cname.c-expected +++ b/tests/arrays/field-global-length-cname.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/fixed-length-enum-value.c-expected b/tests/arrays/fixed-length-enum-value.c-expected index 1a2cc7bd0..acaad7d64 100644 --- a/tests/arrays/fixed-length-enum-value.c-expected +++ b/tests/arrays/fixed-length-enum-value.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/fixed-length-init0-not-allowed.c-expected b/tests/arrays/fixed-length-init0-not-allowed.c-expected index 0644c3c05..0a753347a 100644 --- a/tests/arrays/fixed-length-init0-not-allowed.c-expected +++ b/tests/arrays/fixed-length-init0-not-allowed.c-expected @@ -6,9 +6,8 @@ #define BAR 1024 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/arrays/in-operator-with-boxed-needle.c-expected b/tests/arrays/in-operator-with-boxed-needle.c-expected index 4215b3e98..da8a6d207 100644 --- a/tests/arrays/in-operator-with-boxed-needle.c-expected +++ b/tests/arrays/in-operator-with-boxed-needle.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/arrays/inline-namespace-field.c-expected b/tests/arrays/inline-namespace-field.c-expected index 41720f234..0b41859ee 100644 --- a/tests/arrays/inline-namespace-field.c-expected +++ b/tests/arrays/inline-namespace-field.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/inline-struct.c-expected b/tests/arrays/inline-struct.c-expected index dd815a286..c34018bff 100644 --- a/tests/arrays/inline-struct.c-expected +++ b/tests/arrays/inline-struct.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/length-inline-assignment.c-expected b/tests/arrays/length-inline-assignment.c-expected index 41c110020..242d48bc2 100644 --- a/tests/arrays/length-inline-assignment.c-expected +++ b/tests/arrays/length-inline-assignment.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/arrays/length-type-include.c-expected b/tests/arrays/length-type-include.c-expected index 59d66c530..9127608ba 100644 --- a/tests/arrays/length-type-include.c-expected +++ b/tests/arrays/length-type-include.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/arrays/length-type.c-expected b/tests/arrays/length-type.c-expected index 6d5dc17e9..01564556c 100644 --- a/tests/arrays/length-type.c-expected +++ b/tests/arrays/length-type.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/resize-local-size-captured.c-expected b/tests/arrays/resize-local-size-captured.c-expected index 9ed97d3e8..2b19aedca 100644 --- a/tests/arrays/resize-local-size-captured.c-expected +++ b/tests/arrays/resize-local-size-captured.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef void (*FooFunc) (gpointer user_data); diff --git a/tests/arrays/resize-local-size.c-expected b/tests/arrays/resize-local-size.c-expected index 9a111c2cf..4bfc28bd1 100644 --- a/tests/arrays/resize-local-size.c-expected +++ b/tests/arrays/resize-local-size.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/arrays/resize.c-expected b/tests/arrays/resize.c-expected index c14cffbd9..e6604efd6 100644 --- a/tests/arrays/resize.c-expected +++ b/tests/arrays/resize.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/slice-fixed-length.c-expected b/tests/arrays/slice-fixed-length.c-expected index 89cfe581d..e4ca1713f 100644 --- a/tests/arrays/slice-fixed-length.c-expected +++ b/tests/arrays/slice-fixed-length.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/struct-field-initializer.c-expected b/tests/arrays/struct-field-initializer.c-expected index 2c194efc2..47609b285 100644 --- a/tests/arrays/struct-field-initializer.c-expected +++ b/tests/arrays/struct-field-initializer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/struct-field-length-cname.c-expected b/tests/arrays/struct-field-length-cname.c-expected index feeea4b8e..c9c5e2b90 100644 --- a/tests/arrays/struct-field-length-cname.c-expected +++ b/tests/arrays/struct-field-length-cname.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/struct-initializer-null.c-expected b/tests/arrays/struct-initializer-null.c-expected index 9b8338e08..e7c1c02c5 100644 --- a/tests/arrays/struct-initializer-null.c-expected +++ b/tests/arrays/struct-initializer-null.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/arrays/struct-namespaced-initializer.c-expected b/tests/arrays/struct-namespaced-initializer.c-expected index 3f6fd851a..87abda407 100644 --- a/tests/arrays/struct-namespaced-initializer.c-expected +++ b/tests/arrays/struct-namespaced-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug595735.c-expected b/tests/asynchronous/bug595735.c-expected index adc0afa37..f0050652e 100644 --- a/tests/asynchronous/bug595735.c-expected +++ b/tests/asynchronous/bug595735.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug595755.c-expected b/tests/asynchronous/bug595755.c-expected index 60bd0d6aa..4fe898ef3 100644 --- a/tests/asynchronous/bug595755.c-expected +++ b/tests/asynchronous/bug595755.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug596177.c-expected b/tests/asynchronous/bug596177.c-expected index 7021d95c2..b748faf56 100644 --- a/tests/asynchronous/bug596177.c-expected +++ b/tests/asynchronous/bug596177.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug596861.c-expected b/tests/asynchronous/bug596861.c-expected index 778f2fd08..d4fd43d8d 100644 --- a/tests/asynchronous/bug596861.c-expected +++ b/tests/asynchronous/bug596861.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug597294.c-expected b/tests/asynchronous/bug597294.c-expected index eafbebe37..477a6ad1c 100644 --- a/tests/asynchronous/bug597294.c-expected +++ b/tests/asynchronous/bug597294.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug598677.c-expected b/tests/asynchronous/bug598677.c-expected index 971088d44..8dd183ee5 100644 --- a/tests/asynchronous/bug598677.c-expected +++ b/tests/asynchronous/bug598677.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug598697.c-expected b/tests/asynchronous/bug598697.c-expected index ef18ebe3e..56f6fbd42 100644 --- a/tests/asynchronous/bug598697.c-expected +++ b/tests/asynchronous/bug598697.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug598698.c-expected b/tests/asynchronous/bug598698.c-expected index ea6593ebe..2534a8a8d 100644 --- a/tests/asynchronous/bug598698.c-expected +++ b/tests/asynchronous/bug598698.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug599568.c-expected b/tests/asynchronous/bug599568.c-expected index d9a7c2a0c..99f3f9387 100644 --- a/tests/asynchronous/bug599568.c-expected +++ b/tests/asynchronous/bug599568.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug600827.c-expected b/tests/asynchronous/bug600827.c-expected index c910ae114..34abb6b30 100644 --- a/tests/asynchronous/bug600827.c-expected +++ b/tests/asynchronous/bug600827.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug601558.c-expected b/tests/asynchronous/bug601558.c-expected index f98a43181..9a1318788 100644 --- a/tests/asynchronous/bug601558.c-expected +++ b/tests/asynchronous/bug601558.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug602594.c-expected b/tests/asynchronous/bug602594.c-expected index 2452083c3..fc92b69f1 100644 --- a/tests/asynchronous/bug602594.c-expected +++ b/tests/asynchronous/bug602594.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug612641.c-expected b/tests/asynchronous/bug612641.c-expected index 0756f413b..11b28d304 100644 --- a/tests/asynchronous/bug612641.c-expected +++ b/tests/asynchronous/bug612641.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug613484.c-expected b/tests/asynchronous/bug613484.c-expected index 28e61c16d..e2c208ce7 100644 --- a/tests/asynchronous/bug613484.c-expected +++ b/tests/asynchronous/bug613484.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug614294.c-expected b/tests/asynchronous/bug614294.c-expected index 041bb4d6d..a916e0fdd 100644 --- a/tests/asynchronous/bug614294.c-expected +++ b/tests/asynchronous/bug614294.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug620740.c-expected b/tests/asynchronous/bug620740.c-expected index 956a6620f..7541ae6fb 100644 --- a/tests/asynchronous/bug620740.c-expected +++ b/tests/asynchronous/bug620740.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug626053.c-expected b/tests/asynchronous/bug626053.c-expected index 9503a7b3d..7cab8c38a 100644 --- a/tests/asynchronous/bug626053.c-expected +++ b/tests/asynchronous/bug626053.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug639591.c-expected b/tests/asynchronous/bug639591.c-expected index 2dacf3fe5..8265902c6 100644 --- a/tests/asynchronous/bug639591.c-expected +++ b/tests/asynchronous/bug639591.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug640721.c-expected b/tests/asynchronous/bug640721.c-expected index 57076ced7..5e904c523 100644 --- a/tests/asynchronous/bug640721.c-expected +++ b/tests/asynchronous/bug640721.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug641182.c-expected b/tests/asynchronous/bug641182.c-expected index 64cbbae1b..312ab9995 100644 --- a/tests/asynchronous/bug641182.c-expected +++ b/tests/asynchronous/bug641182.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug646945.c-expected b/tests/asynchronous/bug646945.c-expected index 27ce3894e..2299a967f 100644 --- a/tests/asynchronous/bug646945.c-expected +++ b/tests/asynchronous/bug646945.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug652252.c-expected b/tests/asynchronous/bug652252.c-expected index ef2612472..44e21202c 100644 --- a/tests/asynchronous/bug652252.c-expected +++ b/tests/asynchronous/bug652252.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug653861.c-expected b/tests/asynchronous/bug653861.c-expected index 6e3775f8c..eaf92ac01 100644 --- a/tests/asynchronous/bug653861.c-expected +++ b/tests/asynchronous/bug653861.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug654336.c-expected b/tests/asynchronous/bug654336.c-expected index 6b651a629..2539c9d70 100644 --- a/tests/asynchronous/bug654336.c-expected +++ b/tests/asynchronous/bug654336.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug654337.c-expected b/tests/asynchronous/bug654337.c-expected index 22cc73e17..fe8be4ccc 100644 --- a/tests/asynchronous/bug654337.c-expected +++ b/tests/asynchronous/bug654337.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug659886.c-expected b/tests/asynchronous/bug659886.c-expected index 08506ea66..3ab35a2d5 100644 --- a/tests/asynchronous/bug659886.c-expected +++ b/tests/asynchronous/bug659886.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug661961.c-expected b/tests/asynchronous/bug661961.c-expected index 9ec564693..0af38be1b 100644 --- a/tests/asynchronous/bug661961.c-expected +++ b/tests/asynchronous/bug661961.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug710103.c-expected b/tests/asynchronous/bug710103.c-expected index 302742bff..237290ed8 100644 --- a/tests/asynchronous/bug710103.c-expected +++ b/tests/asynchronous/bug710103.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug741929.c-expected b/tests/asynchronous/bug741929.c-expected index fd31c3b31..fb0d27ce6 100644 --- a/tests/asynchronous/bug741929.c-expected +++ b/tests/asynchronous/bug741929.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug742621.c-expected b/tests/asynchronous/bug742621.c-expected index 985d94cfb..547f2cc0d 100644 --- a/tests/asynchronous/bug742621.c-expected +++ b/tests/asynchronous/bug742621.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug762819.c-expected b/tests/asynchronous/bug762819.c-expected index e2a25a47d..7175607d3 100644 --- a/tests/asynchronous/bug762819.c-expected +++ b/tests/asynchronous/bug762819.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug777242.c-expected b/tests/asynchronous/bug777242.c-expected index 75098e098..578a26f49 100644 --- a/tests/asynchronous/bug777242.c-expected +++ b/tests/asynchronous/bug777242.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug783543.c-expected b/tests/asynchronous/bug783543.c-expected index 30ebde3cd..b7e697e67 100644 --- a/tests/asynchronous/bug783543.c-expected +++ b/tests/asynchronous/bug783543.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug792660.c-expected b/tests/asynchronous/bug792660.c-expected index 85f75674e..bf040b38d 100644 --- a/tests/asynchronous/bug792660.c-expected +++ b/tests/asynchronous/bug792660.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug792942.c-expected b/tests/asynchronous/bug792942.c-expected index b7ffde04f..2d9cba6ab 100644 --- a/tests/asynchronous/bug792942.c-expected +++ b/tests/asynchronous/bug792942.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/bug793158.c-expected b/tests/asynchronous/bug793158.c-expected index a3b56103a..47e36ddaf 100644 --- a/tests/asynchronous/bug793158.c-expected +++ b/tests/asynchronous/bug793158.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/captured-fixed-array.c-expected b/tests/asynchronous/captured-fixed-array.c-expected index bfb5b7d84..3761f5d01 100644 --- a/tests/asynchronous/captured-fixed-array.c-expected +++ b/tests/asynchronous/captured-fixed-array.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/catch-error-scope.c-expected b/tests/asynchronous/catch-error-scope.c-expected index 368fc25e8..72f930ddf 100644 --- a/tests/asynchronous/catch-error-scope.c-expected +++ b/tests/asynchronous/catch-error-scope.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/catch-in-finally.c-expected b/tests/asynchronous/catch-in-finally.c-expected index c62781a20..881e6dfd8 100644 --- a/tests/asynchronous/catch-in-finally.c-expected +++ b/tests/asynchronous/catch-in-finally.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/closures.c-expected b/tests/asynchronous/closures.c-expected index 228118c2f..d4fb0e0d0 100644 --- a/tests/asynchronous/closures.c-expected +++ b/tests/asynchronous/closures.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/constructor-argument-check.c-expected b/tests/asynchronous/constructor-argument-check.c-expected index dc1b6927a..a6e6a563b 100644 --- a/tests/asynchronous/constructor-argument-check.c-expected +++ b/tests/asynchronous/constructor-argument-check.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/creation-method-uncaught.c-expected b/tests/asynchronous/creation-method-uncaught.c-expected index 068e4dec0..7999b8137 100644 --- a/tests/asynchronous/creation-method-uncaught.c-expected +++ b/tests/asynchronous/creation-method-uncaught.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/finish-name.c-expected b/tests/asynchronous/finish-name.c-expected index 9fe07f0a6..ba93fef9d 100644 --- a/tests/asynchronous/finish-name.c-expected +++ b/tests/asynchronous/finish-name.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/generator.c-expected b/tests/asynchronous/generator.c-expected index 82141338e..189852e2c 100644 --- a/tests/asynchronous/generator.c-expected +++ b/tests/asynchronous/generator.c-expected @@ -13,9 +13,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -23,7 +22,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -31,9 +29,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -41,7 +39,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -56,6 +53,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/main-block-async-call.c-expected b/tests/asynchronous/main-block-async-call.c-expected index c250ce9bf..a56c9bf9a 100644 --- a/tests/asynchronous/main-block-async-call.c-expected +++ b/tests/asynchronous/main-block-async-call.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/main-block-async-creation.c-expected b/tests/asynchronous/main-block-async-creation.c-expected index 558a17d72..a291301dc 100644 --- a/tests/asynchronous/main-block-async-creation.c-expected +++ b/tests/asynchronous/main-block-async-creation.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/main-block-async-yield.c-expected b/tests/asynchronous/main-block-async-yield.c-expected index 40153582c..a5299631d 100644 --- a/tests/asynchronous/main-block-async-yield.c-expected +++ b/tests/asynchronous/main-block-async-yield.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _ValaMainAsyncData ValaMainAsyncData; diff --git a/tests/asynchronous/method-main-async-void.c-expected b/tests/asynchronous/method-main-async-void.c-expected index fb6eb66e3..5c081ebd3 100644 --- a/tests/asynchronous/method-main-async-void.c-expected +++ b/tests/asynchronous/method-main-async-void.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _ValaMainAsyncData ValaMainAsyncData; diff --git a/tests/asynchronous/method-main-async.c-expected b/tests/asynchronous/method-main-async.c-expected index 1e0fccbfe..9f79212a8 100644 --- a/tests/asynchronous/method-main-async.c-expected +++ b/tests/asynchronous/method-main-async.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/asynchronous/nowrapper.c-expected b/tests/asynchronous/nowrapper.c-expected index 523b29af1..b21e607bb 100644 --- a/tests/asynchronous/nowrapper.c-expected +++ b/tests/asynchronous/nowrapper.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/out-parameter-free-on-error.c-expected b/tests/asynchronous/out-parameter-free-on-error.c-expected index 2fe959b9c..7c826768a 100644 --- a/tests/asynchronous/out-parameter-free-on-error.c-expected +++ b/tests/asynchronous/out-parameter-free-on-error.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/result-pos.c-expected b/tests/asynchronous/result-pos.c-expected index bee5ea87a..2967e93d9 100644 --- a/tests/asynchronous/result-pos.c-expected +++ b/tests/asynchronous/result-pos.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/asynchronous/yield.c-expected b/tests/asynchronous/yield.c-expected index 1970daf29..c8263c588 100644 --- a/tests/asynchronous/yield.c-expected +++ b/tests/asynchronous/yield.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/array-uint8-uchar-compat.c-expected b/tests/basic-types/array-uint8-uchar-compat.c-expected index dccede066..cd633d7c6 100644 --- a/tests/basic-types/array-uint8-uchar-compat.c-expected +++ b/tests/basic-types/array-uint8-uchar-compat.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/arrays-fixed-assignment.c-expected b/tests/basic-types/arrays-fixed-assignment.c-expected index bbae8dcd5..0eb4be623 100644 --- a/tests/basic-types/arrays-fixed-assignment.c-expected +++ b/tests/basic-types/arrays-fixed-assignment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/arrays-generics.c-expected b/tests/basic-types/arrays-generics.c-expected index 6031a251b..9976eaa7f 100644 --- a/tests/basic-types/arrays-generics.c-expected +++ b/tests/basic-types/arrays-generics.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/arrays.c-expected b/tests/basic-types/arrays.c-expected index 3f1173407..a24f73bc4 100644 --- a/tests/basic-types/arrays.c-expected +++ b/tests/basic-types/arrays.c-expected @@ -8,9 +8,8 @@ #define FOO 2 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/boolean-literal.c-expected b/tests/basic-types/boolean-literal.c-expected index cabba0f15..b82ee17f2 100644 --- a/tests/basic-types/boolean-literal.c-expected +++ b/tests/basic-types/boolean-literal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/boolean.c-expected b/tests/basic-types/boolean.c-expected index ad4063c09..d6f0ab973 100644 --- a/tests/basic-types/boolean.c-expected +++ b/tests/basic-types/boolean.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug571486.c-expected b/tests/basic-types/bug571486.c-expected index 65d76e51a..00b135e8a 100644 --- a/tests/basic-types/bug571486.c-expected +++ b/tests/basic-types/bug571486.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug591552.c-expected b/tests/basic-types/bug591552.c-expected index 00038b76c..fbf2447ce 100644 --- a/tests/basic-types/bug591552.c-expected +++ b/tests/basic-types/bug591552.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/basic-types/bug595751.c-expected b/tests/basic-types/bug595751.c-expected index 423ddde9a..0928953f0 100644 --- a/tests/basic-types/bug595751.c-expected +++ b/tests/basic-types/bug595751.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/bug596637.c-expected b/tests/basic-types/bug596637.c-expected index a53dc3ea6..ff2e0977d 100644 --- a/tests/basic-types/bug596637.c-expected +++ b/tests/basic-types/bug596637.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug596785.c-expected b/tests/basic-types/bug596785.c-expected index ffaf0dd09..726981a30 100644 --- a/tests/basic-types/bug596785.c-expected +++ b/tests/basic-types/bug596785.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug604371.c-expected b/tests/basic-types/bug604371.c-expected index 0dde634ae..17e73b399 100644 --- a/tests/basic-types/bug604371.c-expected +++ b/tests/basic-types/bug604371.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug610660.c-expected b/tests/basic-types/bug610660.c-expected index 096d4cca3..d24aa9142 100644 --- a/tests/basic-types/bug610660.c-expected +++ b/tests/basic-types/bug610660.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug622178.c-expected b/tests/basic-types/bug622178.c-expected index 795f6cbca..d935d3218 100644 --- a/tests/basic-types/bug622178.c-expected +++ b/tests/basic-types/bug622178.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug632322.c-expected b/tests/basic-types/bug632322.c-expected index d744738be..3b9389230 100644 --- a/tests/basic-types/bug632322.c-expected +++ b/tests/basic-types/bug632322.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug643612.c-expected b/tests/basic-types/bug643612.c-expected index e548430cb..eabf861cb 100644 --- a/tests/basic-types/bug643612.c-expected +++ b/tests/basic-types/bug643612.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug644046.c-expected b/tests/basic-types/bug644046.c-expected index 4200d4c80..ec410510f 100644 --- a/tests/basic-types/bug644046.c-expected +++ b/tests/basic-types/bug644046.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug647222.c-expected b/tests/basic-types/bug647222.c-expected index 36e6e356b..745322262 100644 --- a/tests/basic-types/bug647222.c-expected +++ b/tests/basic-types/bug647222.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/bug648364.c-expected b/tests/basic-types/bug648364.c-expected index 4bcfba549..b8a8aceb5 100644 --- a/tests/basic-types/bug648364.c-expected +++ b/tests/basic-types/bug648364.c-expected @@ -6,9 +6,8 @@ #define foo 3 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/basic-types/bug650993.c-expected b/tests/basic-types/bug650993.c-expected index 3db8b9b70..983dc13ef 100644 --- a/tests/basic-types/bug650993.c-expected +++ b/tests/basic-types/bug650993.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug652380.c-expected b/tests/basic-types/bug652380.c-expected index e734a8c64..110e09fce 100644 --- a/tests/basic-types/bug652380.c-expected +++ b/tests/basic-types/bug652380.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/bug655908.c-expected b/tests/basic-types/bug655908.c-expected index 5085df95e..df1f30e23 100644 --- a/tests/basic-types/bug655908.c-expected +++ b/tests/basic-types/bug655908.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/basic-types/bug659975.c-expected b/tests/basic-types/bug659975.c-expected index 637e68019..2150b38bc 100644 --- a/tests/basic-types/bug659975.c-expected +++ b/tests/basic-types/bug659975.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug678791.c-expected b/tests/basic-types/bug678791.c-expected index d9b7035f8..cdb02d360 100644 --- a/tests/basic-types/bug678791.c-expected +++ b/tests/basic-types/bug678791.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug686336.c-expected b/tests/basic-types/bug686336.c-expected index ae3eae313..539ea27ea 100644 --- a/tests/basic-types/bug686336.c-expected +++ b/tests/basic-types/bug686336.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug729907.c-expected b/tests/basic-types/bug729907.c-expected index c96a4b62e..e635f6cfe 100644 --- a/tests/basic-types/bug729907.c-expected +++ b/tests/basic-types/bug729907.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug731017.c-expected b/tests/basic-types/bug731017.c-expected index 62c957b79..cc26d8a07 100644 --- a/tests/basic-types/bug731017.c-expected +++ b/tests/basic-types/bug731017.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug756376.c-expected b/tests/basic-types/bug756376.c-expected index 2d2b427b8..79e7ceb54 100644 --- a/tests/basic-types/bug756376.c-expected +++ b/tests/basic-types/bug756376.c-expected @@ -5,9 +5,8 @@ #define FOO_BAR 5 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug761307.c-expected b/tests/basic-types/bug761307.c-expected index 630f9e2ee..7070648d6 100644 --- a/tests/basic-types/bug761307.c-expected +++ b/tests/basic-types/bug761307.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug761736.c-expected b/tests/basic-types/bug761736.c-expected index f4d2b1ca1..3e4a4f0df 100644 --- a/tests/basic-types/bug761736.c-expected +++ b/tests/basic-types/bug761736.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug772426.c-expected b/tests/basic-types/bug772426.c-expected index c8e496f2c..93e1ceac8 100644 --- a/tests/basic-types/bug772426.c-expected +++ b/tests/basic-types/bug772426.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/bug787152.c-expected b/tests/basic-types/bug787152.c-expected index 15fa864bb..78ddde7b8 100644 --- a/tests/basic-types/bug787152.c-expected +++ b/tests/basic-types/bug787152.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/bug788775.c-expected b/tests/basic-types/bug788775.c-expected index 9108d02b5..40cd6fd0f 100644 --- a/tests/basic-types/bug788775.c-expected +++ b/tests/basic-types/bug788775.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/custom-types.c-expected b/tests/basic-types/custom-types.c-expected index 0a5a2414f..82663750a 100644 --- a/tests/basic-types/custom-types.c-expected +++ b/tests/basic-types/custom-types.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef int32_t foo_t; diff --git a/tests/basic-types/default-gtype.c-expected b/tests/basic-types/default-gtype.c-expected index 9176da8b1..441f5978c 100644 --- a/tests/basic-types/default-gtype.c-expected +++ b/tests/basic-types/default-gtype.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/escape-chars.c-expected b/tests/basic-types/escape-chars.c-expected index 06f589b20..5d6a3a54c 100644 --- a/tests/basic-types/escape-chars.c-expected +++ b/tests/basic-types/escape-chars.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/float-literals.c-expected b/tests/basic-types/float-literals.c-expected index a4069e4ba..08bc44284 100644 --- a/tests/basic-types/float-literals.c-expected +++ b/tests/basic-types/float-literals.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/floats-boxed-cast.c-expected b/tests/basic-types/floats-boxed-cast.c-expected index 185db5458..b398b3d92 100644 --- a/tests/basic-types/floats-boxed-cast.c-expected +++ b/tests/basic-types/floats-boxed-cast.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/basic-types/floats-hexadecimal.c-expected b/tests/basic-types/floats-hexadecimal.c-expected index 689773733..80b7f75a6 100644 --- a/tests/basic-types/floats-hexadecimal.c-expected +++ b/tests/basic-types/floats-hexadecimal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/floats.c-expected b/tests/basic-types/floats.c-expected index e50ac05a2..e96546fcc 100644 --- a/tests/basic-types/floats.c-expected +++ b/tests/basic-types/floats.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/garray.c-expected b/tests/basic-types/garray.c-expected index 9c80ddb3e..a10b37a31 100644 --- a/tests/basic-types/garray.c-expected +++ b/tests/basic-types/garray.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/gassert.c-expected b/tests/basic-types/gassert.c-expected index e3389801b..22f526cc5 100644 --- a/tests/basic-types/gassert.c-expected +++ b/tests/basic-types/gassert.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/glists.c-expected b/tests/basic-types/glists.c-expected index 2e34e0f06..074aa9b5a 100644 --- a/tests/basic-types/glists.c-expected +++ b/tests/basic-types/glists.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/glists_remove.c-expected b/tests/basic-types/glists_remove.c-expected index 2d33080ef..4a11104bb 100644 --- a/tests/basic-types/glists_remove.c-expected +++ b/tests/basic-types/glists_remove.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/gptrarray.c-expected b/tests/basic-types/gptrarray.c-expected index a9e42ff54..1b02cc351 100644 --- a/tests/basic-types/gptrarray.c-expected +++ b/tests/basic-types/gptrarray.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/gvariants-unboxing-safe.c-expected b/tests/basic-types/gvariants-unboxing-safe.c-expected index 08ceecad1..458a4fc06 100644 --- a/tests/basic-types/gvariants-unboxing-safe.c-expected +++ b/tests/basic-types/gvariants-unboxing-safe.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/gvariants.c-expected b/tests/basic-types/gvariants.c-expected index 1ef2f17f1..924adf7d7 100644 --- a/tests/basic-types/gvariants.c-expected +++ b/tests/basic-types/gvariants.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/integer-literals.c-expected b/tests/basic-types/integer-literals.c-expected index 98607e8be..7e74260a8 100644 --- a/tests/basic-types/integer-literals.c-expected +++ b/tests/basic-types/integer-literals.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/integers-binary.c-expected b/tests/basic-types/integers-binary.c-expected index 073ccf691..9183e1a2c 100644 --- a/tests/basic-types/integers-binary.c-expected +++ b/tests/basic-types/integers-binary.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/integers-boxed-cast.c-expected b/tests/basic-types/integers-boxed-cast.c-expected index 5d1982e4c..ae75ae342 100644 --- a/tests/basic-types/integers-boxed-cast.c-expected +++ b/tests/basic-types/integers-boxed-cast.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/basic-types/integers-negative-rank.c-expected b/tests/basic-types/integers-negative-rank.c-expected index 884be628f..8bb05e48c 100644 --- a/tests/basic-types/integers-negative-rank.c-expected +++ b/tests/basic-types/integers-negative-rank.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef int32_t gint; diff --git a/tests/basic-types/integers-octal.c-expected b/tests/basic-types/integers-octal.c-expected index 5d2f3853d..efe94f420 100644 --- a/tests/basic-types/integers-octal.c-expected +++ b/tests/basic-types/integers-octal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/integers.c-expected b/tests/basic-types/integers.c-expected index 716704978..c4d6d5b0e 100644 --- a/tests/basic-types/integers.c-expected +++ b/tests/basic-types/integers.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/null.c-expected b/tests/basic-types/null.c-expected index 6d317581f..17158c52d 100644 --- a/tests/basic-types/null.c-expected +++ b/tests/basic-types/null.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/basic-types/pointers-arithmetic.c-expected b/tests/basic-types/pointers-arithmetic.c-expected index 56a4725c2..6c4e82e97 100644 --- a/tests/basic-types/pointers-arithmetic.c-expected +++ b/tests/basic-types/pointers-arithmetic.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/pointers.c-expected b/tests/basic-types/pointers.c-expected index 3d9fe2a32..2ad666065 100644 --- a/tests/basic-types/pointers.c-expected +++ b/tests/basic-types/pointers.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/basic-types/sizeof.c-expected b/tests/basic-types/sizeof.c-expected index 8c7a266fd..f7eb75d49 100644 --- a/tests/basic-types/sizeof.c-expected +++ b/tests/basic-types/sizeof.c-expected @@ -6,9 +6,8 @@ #define simple_size ((gsize) sizeof (gint)) #define composed_size ((gsize) (sizeof (gint) + sizeof (gsize))) #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/string-array-append.c-expected b/tests/basic-types/string-array-append.c-expected index 3b4010d9e..65405a77d 100644 --- a/tests/basic-types/string-array-append.c-expected +++ b/tests/basic-types/string-array-append.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/basic-types/string-relation.c-expected b/tests/basic-types/string-relation.c-expected index 0b7043c18..df6d1d187 100644 --- a/tests/basic-types/string-relation.c-expected +++ b/tests/basic-types/string-relation.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/basic-types/strings.c-expected b/tests/basic-types/strings.c-expected index 318f489d1..489039422 100644 --- a/tests/basic-types/strings.c-expected +++ b/tests/basic-types/strings.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/bindings/gio/memoryoutputstream.c-expected b/tests/bindings/gio/memoryoutputstream.c-expected index febdf4fed..d8582b4a0 100644 --- a/tests/bindings/gio/memoryoutputstream.c-expected +++ b/tests/bindings/gio/memoryoutputstream.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/bug791785.c-expected b/tests/chainup/bug791785.c-expected index 9b7dc5314..848671fb1 100644 --- a/tests/chainup/bug791785.c-expected +++ b/tests/chainup/bug791785.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-base-foo.c-expected b/tests/chainup/class-base-foo.c-expected index 51680e48f..392776bc0 100644 --- a/tests/chainup/class-base-foo.c-expected +++ b/tests/chainup/class-base-foo.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-base.c-expected b/tests/chainup/class-base.c-expected index 883b4997a..41649c35f 100644 --- a/tests/chainup/class-base.c-expected +++ b/tests/chainup/class-base.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-compact-base.c-expected b/tests/chainup/class-compact-base.c-expected index 1c8a0f86b..416d93628 100644 --- a/tests/chainup/class-compact-base.c-expected +++ b/tests/chainup/class-compact-base.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-compact-this.c-expected b/tests/chainup/class-compact-this.c-expected index 543248f04..f2c36e22b 100644 --- a/tests/chainup/class-compact-this.c-expected +++ b/tests/chainup/class-compact-this.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-object.c-expected b/tests/chainup/class-object.c-expected index e57742354..17756c41a 100644 --- a/tests/chainup/class-object.c-expected +++ b/tests/chainup/class-object.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-this-foo.c-expected b/tests/chainup/class-this-foo.c-expected index dbca0cb63..bc253c2c0 100644 --- a/tests/chainup/class-this-foo.c-expected +++ b/tests/chainup/class-this-foo.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/class-this.c-expected b/tests/chainup/class-this.c-expected index f66866816..d3374318b 100644 --- a/tests/chainup/class-this.c-expected +++ b/tests/chainup/class-this.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/method-lambda-base.c-expected b/tests/chainup/method-lambda-base.c-expected index 1aeabe7e2..031dc0c7e 100644 --- a/tests/chainup/method-lambda-base.c-expected +++ b/tests/chainup/method-lambda-base.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/no-chainup.c-expected b/tests/chainup/no-chainup.c-expected index 2f0027e3c..809bfd7e1 100644 --- a/tests/chainup/no-chainup.c-expected +++ b/tests/chainup/no-chainup.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/signal-default-handler.c-expected b/tests/chainup/signal-default-handler.c-expected index f5523f4b8..6743a8ede 100644 --- a/tests/chainup/signal-default-handler.c-expected +++ b/tests/chainup/signal-default-handler.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-base-foo.c-expected b/tests/chainup/struct-base-foo.c-expected index dee9cdc72..02ad7b220 100644 --- a/tests/chainup/struct-base-foo.c-expected +++ b/tests/chainup/struct-base-foo.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-base.c-expected b/tests/chainup/struct-base.c-expected index fa6fb7cab..bd1789db2 100644 --- a/tests/chainup/struct-base.c-expected +++ b/tests/chainup/struct-base.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-no-gtype-base.c-expected b/tests/chainup/struct-no-gtype-base.c-expected index d6f265198..fccfd4991 100644 --- a/tests/chainup/struct-no-gtype-base.c-expected +++ b/tests/chainup/struct-no-gtype-base.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-simple-no-gtype-base.c-expected b/tests/chainup/struct-simple-no-gtype-base.c-expected index 0a419ce58..143f0bf9a 100644 --- a/tests/chainup/struct-simple-no-gtype-base.c-expected +++ b/tests/chainup/struct-simple-no-gtype-base.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-this-foo.c-expected b/tests/chainup/struct-this-foo.c-expected index f884e340a..2275f6270 100644 --- a/tests/chainup/struct-this-foo.c-expected +++ b/tests/chainup/struct-this-foo.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/chainup/struct-this.c-expected b/tests/chainup/struct-this.c-expected index aae9738b5..0ba402825 100644 --- a/tests/chainup/struct-this.c-expected +++ b/tests/chainup/struct-this.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/constants/delegate-type.c-expected b/tests/constants/delegate-type.c-expected index 3d152f387..6a53b4fec 100644 --- a/tests/constants/delegate-type.c-expected +++ b/tests/constants/delegate-type.c-expected @@ -7,9 +7,8 @@ #define FOO _func_foo_func #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/constants/glog.c-expected b/tests/constants/glog.c-expected index 802ab5e59..f251d7664 100644 --- a/tests/constants/glog.c-expected +++ b/tests/constants/glog.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/constants/member-access-enum.c-expected b/tests/constants/member-access-enum.c-expected index 0717159c4..65d9530b8 100644 --- a/tests/constants/member-access-enum.c-expected +++ b/tests/constants/member-access-enum.c-expected @@ -8,9 +8,8 @@ #define FOO FOO_MANAM #define FAZ FOO_MINIM #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/constants/member-access.c-expected b/tests/constants/member-access.c-expected index 36c3f8e59..3aa155169 100644 --- a/tests/constants/member-access.c-expected +++ b/tests/constants/member-access.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/constants/strings.c-expected b/tests/constants/strings.c-expected index bdcbace90..9ff7dafd2 100644 --- a/tests/constants/strings.c-expected +++ b/tests/constants/strings.c-expected @@ -9,9 +9,8 @@ #define FOO "string constant" #define BAR _ ("translated string constant") #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/control-flow/assigned-local-variable.c-expected b/tests/control-flow/assigned-local-variable.c-expected index d52e8e832..95f673723 100644 --- a/tests/control-flow/assigned-local-variable.c-expected +++ b/tests/control-flow/assigned-local-variable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/break.c-expected b/tests/control-flow/break.c-expected index e4304164b..eb6b91eaa 100644 --- a/tests/control-flow/break.c-expected +++ b/tests/control-flow/break.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug628336.c-expected b/tests/control-flow/bug628336.c-expected index 59d5bd69a..22230df82 100644 --- a/tests/control-flow/bug628336.c-expected +++ b/tests/control-flow/bug628336.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _Block1Data Block1Data; diff --git a/tests/control-flow/bug639482.c-expected b/tests/control-flow/bug639482.c-expected index 4ff99d850..cc388b4c9 100644 --- a/tests/control-flow/bug639482.c-expected +++ b/tests/control-flow/bug639482.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug652549.c-expected b/tests/control-flow/bug652549.c-expected index 2758c50e1..7f0878afd 100644 --- a/tests/control-flow/bug652549.c-expected +++ b/tests/control-flow/bug652549.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/control-flow/bug661985.c-expected b/tests/control-flow/bug661985.c-expected index 203cdfab5..5b27267f0 100644 --- a/tests/control-flow/bug661985.c-expected +++ b/tests/control-flow/bug661985.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/control-flow/bug665904.c-expected b/tests/control-flow/bug665904.c-expected index e1e435244..467282fba 100644 --- a/tests/control-flow/bug665904.c-expected +++ b/tests/control-flow/bug665904.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) diff --git a/tests/control-flow/bug691514.c-expected b/tests/control-flow/bug691514.c-expected index 0ee8eef14..5cc0be411 100644 --- a/tests/control-flow/bug691514.c-expected +++ b/tests/control-flow/bug691514.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug736774-1.c-expected b/tests/control-flow/bug736774-1.c-expected index 53dcd4d0e..fc65d039b 100644 --- a/tests/control-flow/bug736774-1.c-expected +++ b/tests/control-flow/bug736774-1.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug736774-2.c-expected b/tests/control-flow/bug736774-2.c-expected index 01c334ce4..67b615cc9 100644 --- a/tests/control-flow/bug736774-2.c-expected +++ b/tests/control-flow/bug736774-2.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug761267-1.c-expected b/tests/control-flow/bug761267-1.c-expected index 6cd8e0cdc..5e58174ce 100644 --- a/tests/control-flow/bug761267-1.c-expected +++ b/tests/control-flow/bug761267-1.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug761267-2.c-expected b/tests/control-flow/bug761267-2.c-expected index fe07d0ec4..78c077192 100644 --- a/tests/control-flow/bug761267-2.c-expected +++ b/tests/control-flow/bug761267-2.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/bug764440.c-expected b/tests/control-flow/bug764440.c-expected index 8f97dd8d7..210c68ba2 100644 --- a/tests/control-flow/bug764440.c-expected +++ b/tests/control-flow/bug764440.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/coalesce-as-argument.c-expected b/tests/control-flow/coalesce-as-argument.c-expected index 5cc522199..ed6ee183f 100644 --- a/tests/control-flow/coalesce-as-argument.c-expected +++ b/tests/control-flow/coalesce-as-argument.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/coalesce-execution-order.c-expected b/tests/control-flow/coalesce-execution-order.c-expected index d96211011..715198bd1 100644 --- a/tests/control-flow/coalesce-execution-order.c-expected +++ b/tests/control-flow/coalesce-execution-order.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/coalesce-reference-transfer.c-expected b/tests/control-flow/coalesce-reference-transfer.c-expected index cf9b5ac8c..0e48e13dd 100644 --- a/tests/control-flow/coalesce-reference-transfer.c-expected +++ b/tests/control-flow/coalesce-reference-transfer.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/coalesce-right-value.c-expected b/tests/control-flow/coalesce-right-value.c-expected index 9d1ca6c6a..24ca56652 100644 --- a/tests/control-flow/coalesce-right-value.c-expected +++ b/tests/control-flow/coalesce-right-value.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/coalesce-short-circuit.c-expected b/tests/control-flow/coalesce-short-circuit.c-expected index 38228bb12..24d2019c1 100644 --- a/tests/control-flow/coalesce-short-circuit.c-expected +++ b/tests/control-flow/coalesce-short-circuit.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/conditional-as-argument.c-expected b/tests/control-flow/conditional-as-argument.c-expected index 932e4c0d9..1d573d4c8 100644 --- a/tests/control-flow/conditional-as-argument.c-expected +++ b/tests/control-flow/conditional-as-argument.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/expressions-conditional.c-expected b/tests/control-flow/expressions-conditional.c-expected index bf8a26623..5b347dc5b 100644 --- a/tests/control-flow/expressions-conditional.c-expected +++ b/tests/control-flow/expressions-conditional.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/finally-no-return.c-expected b/tests/control-flow/finally-no-return.c-expected index 7010af61f..a164e8bdc 100644 --- a/tests/control-flow/finally-no-return.c-expected +++ b/tests/control-flow/finally-no-return.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/for-switch-continue.c-expected b/tests/control-flow/for-switch-continue.c-expected index 8fcf3121d..c23bd5eda 100644 --- a/tests/control-flow/for-switch-continue.c-expected +++ b/tests/control-flow/for-switch-continue.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/for.c-expected b/tests/control-flow/for.c-expected index d05c810a9..46d0dc77c 100644 --- a/tests/control-flow/for.c-expected +++ b/tests/control-flow/for.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/foreach.c-expected b/tests/control-flow/foreach.c-expected index 9c271e417..9d35d899e 100644 --- a/tests/control-flow/foreach.c-expected +++ b/tests/control-flow/foreach.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/local-clash-with-implicit-this.c-expected b/tests/control-flow/local-clash-with-implicit-this.c-expected index 079239d38..abeb367e9 100644 --- a/tests/control-flow/local-clash-with-implicit-this.c-expected +++ b/tests/control-flow/local-clash-with-implicit-this.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/lock-if-throw.c-expected b/tests/control-flow/lock-if-throw.c-expected index b3f54dec4..71fb42711 100644 --- a/tests/control-flow/lock-if-throw.c-expected +++ b/tests/control-flow/lock-if-throw.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/nested-conditional.c-expected b/tests/control-flow/nested-conditional.c-expected index dcb457a6f..9081bc201 100644 --- a/tests/control-flow/nested-conditional.c-expected +++ b/tests/control-flow/nested-conditional.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/null-conditional-bool.c-expected b/tests/control-flow/null-conditional-bool.c-expected index c4f2e3d30..52b120a99 100644 --- a/tests/control-flow/null-conditional-bool.c-expected +++ b/tests/control-flow/null-conditional-bool.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/pre-post-increment-array-index.c-expected b/tests/control-flow/pre-post-increment-array-index.c-expected index 73a924512..371fdcde6 100644 --- a/tests/control-flow/pre-post-increment-array-index.c-expected +++ b/tests/control-flow/pre-post-increment-array-index.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/control-flow/pre-post-increment-field.c-expected b/tests/control-flow/pre-post-increment-field.c-expected index 88061b566..140cdbc20 100644 --- a/tests/control-flow/pre-post-increment-field.c-expected +++ b/tests/control-flow/pre-post-increment-field.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/pre-post-increment-local.c-expected b/tests/control-flow/pre-post-increment-local.c-expected index 5caaa6e44..699353ccb 100644 --- a/tests/control-flow/pre-post-increment-local.c-expected +++ b/tests/control-flow/pre-post-increment-local.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/control-flow/pre-post-increment-parameter.c-expected b/tests/control-flow/pre-post-increment-parameter.c-expected index a1af864e7..d08799d58 100644 --- a/tests/control-flow/pre-post-increment-parameter.c-expected +++ b/tests/control-flow/pre-post-increment-parameter.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/pre-post-increment-property.c-expected b/tests/control-flow/pre-post-increment-property.c-expected index 353ee5fa9..b5210710e 100644 --- a/tests/control-flow/pre-post-increment-property.c-expected +++ b/tests/control-flow/pre-post-increment-property.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/pre-post-increment.c-expected b/tests/control-flow/pre-post-increment.c-expected index 9c124bf3a..c646d5096 100644 --- a/tests/control-flow/pre-post-increment.c-expected +++ b/tests/control-flow/pre-post-increment.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/control-flow/sideeffects.c-expected b/tests/control-flow/sideeffects.c-expected index 85d89f75c..dae4b2ec0 100644 --- a/tests/control-flow/sideeffects.c-expected +++ b/tests/control-flow/sideeffects.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/switch-enum.c-expected b/tests/control-flow/switch-enum.c-expected index 3483a8ac0..12a037661 100644 --- a/tests/control-flow/switch-enum.c-expected +++ b/tests/control-flow/switch-enum.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/switch-string.c-expected b/tests/control-flow/switch-string.c-expected index d2c1f0bf6..c40a8e362 100644 --- a/tests/control-flow/switch-string.c-expected +++ b/tests/control-flow/switch-string.c-expected @@ -9,9 +9,8 @@ #define BAR "bar" #define MANAM "manam" #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/switch.c-expected b/tests/control-flow/switch.c-expected index e71bc91bf..55a80c8da 100644 --- a/tests/control-flow/switch.c-expected +++ b/tests/control-flow/switch.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/control-flow/while-false.c-expected b/tests/control-flow/while-false.c-expected index d33a03a43..c982884c2 100644 --- a/tests/control-flow/while-false.c-expected +++ b/tests/control-flow/while-false.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/dbus/arrays_client.c-expected b/tests/dbus/arrays_client.c-expected index 11765d9e7..d32454f9c 100644 --- a/tests/dbus/arrays_client.c-expected +++ b/tests/dbus/arrays_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/arrays_server.c-expected b/tests/dbus/arrays_server.c-expected index e0bcab984..738d1e906 100644 --- a/tests/dbus/arrays_server.c-expected +++ b/tests/dbus/arrays_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-bus_client.c-expected b/tests/dbus/async-bus_client.c-expected index 59f9fe87f..8f7793051 100644 --- a/tests/dbus/async-bus_client.c-expected +++ b/tests/dbus/async-bus_client.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-bus_server.c-expected b/tests/dbus/async-bus_server.c-expected index 1f9568c85..3f9ec799b 100644 --- a/tests/dbus/async-bus_server.c-expected +++ b/tests/dbus/async-bus_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-connection_client.c-expected b/tests/dbus/async-connection_client.c-expected index c1337615d..8121d5e2b 100644 --- a/tests/dbus/async-connection_client.c-expected +++ b/tests/dbus/async-connection_client.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-connection_server.c-expected b/tests/dbus/async-connection_server.c-expected index c34250af5..dd03520a6 100644 --- a/tests/dbus/async-connection_server.c-expected +++ b/tests/dbus/async-connection_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-errors_client.c-expected b/tests/dbus/async-errors_client.c-expected index 512cdc354..e76f5a87c 100644 --- a/tests/dbus/async-errors_client.c-expected +++ b/tests/dbus/async-errors_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-errors_server.c-expected b/tests/dbus/async-errors_server.c-expected index 9f41a94c9..1a9ea3ad8 100644 --- a/tests/dbus/async-errors_server.c-expected +++ b/tests/dbus/async-errors_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-relay_client.c-expected b/tests/dbus/async-no-reply-relay_client.c-expected index 19e6f8975..c707f4838 100644 --- a/tests/dbus/async-no-reply-relay_client.c-expected +++ b/tests/dbus/async-no-reply-relay_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-relay_server.c-expected b/tests/dbus/async-no-reply-relay_server.c-expected index fb0816948..e9f8283df 100644 --- a/tests/dbus/async-no-reply-relay_server.c-expected +++ b/tests/dbus/async-no-reply-relay_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-request_client.c-expected b/tests/dbus/async-no-reply-request_client.c-expected index 24876f3f8..6afc67d27 100644 --- a/tests/dbus/async-no-reply-request_client.c-expected +++ b/tests/dbus/async-no-reply-request_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-request_server.c-expected b/tests/dbus/async-no-reply-request_server.c-expected index f876b2c72..058ec5459 100644 --- a/tests/dbus/async-no-reply-request_server.c-expected +++ b/tests/dbus/async-no-reply-request_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-response_client.c-expected b/tests/dbus/async-no-reply-response_client.c-expected index 76c0e6dbd..7098d486d 100644 --- a/tests/dbus/async-no-reply-response_client.c-expected +++ b/tests/dbus/async-no-reply-response_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async-no-reply-response_server.c-expected b/tests/dbus/async-no-reply-response_server.c-expected index 442c9ad8b..30fd51d93 100644 --- a/tests/dbus/async-no-reply-response_server.c-expected +++ b/tests/dbus/async-no-reply-response_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async_client.c-expected b/tests/dbus/async_client.c-expected index 71922b15a..50f6e4358 100644 --- a/tests/dbus/async_client.c-expected +++ b/tests/dbus/async_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/async_server.c-expected b/tests/dbus/async_server.c-expected index 8a4a7d23c..5a9a5cda8 100644 --- a/tests/dbus/async_server.c-expected +++ b/tests/dbus/async_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/basic-types_client.c-expected b/tests/dbus/basic-types_client.c-expected index 211a567de..46a2e4aa5 100644 --- a/tests/dbus/basic-types_client.c-expected +++ b/tests/dbus/basic-types_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/basic-types_server.c-expected b/tests/dbus/basic-types_server.c-expected index b3a0c5286..0dc523925 100644 --- a/tests/dbus/basic-types_server.c-expected +++ b/tests/dbus/basic-types_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug596862.c-expected b/tests/dbus/bug596862.c-expected index 812a3bc63..9e854682b 100644 --- a/tests/dbus/bug596862.c-expected +++ b/tests/dbus/bug596862.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug602003_client.c-expected b/tests/dbus/bug602003_client.c-expected index e33fc8c74..41695c893 100644 --- a/tests/dbus/bug602003_client.c-expected +++ b/tests/dbus/bug602003_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug602003_server.c-expected b/tests/dbus/bug602003_server.c-expected index 4b9799321..a8775098c 100644 --- a/tests/dbus/bug602003_server.c-expected +++ b/tests/dbus/bug602003_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug735437_client.c-expected b/tests/dbus/bug735437_client.c-expected index ee0c8698e..a17166c5f 100644 --- a/tests/dbus/bug735437_client.c-expected +++ b/tests/dbus/bug735437_client.c-expected @@ -10,9 +10,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug735437_server.c-expected b/tests/dbus/bug735437_server.c-expected index 367fb8053..02b8af7f3 100644 --- a/tests/dbus/bug735437_server.c-expected +++ b/tests/dbus/bug735437_server.c-expected @@ -10,9 +10,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug782719_client.c-expected b/tests/dbus/bug782719_client.c-expected index 3bcee0671..abe2bdb36 100644 --- a/tests/dbus/bug782719_client.c-expected +++ b/tests/dbus/bug782719_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug782719_server.c-expected b/tests/dbus/bug782719_server.c-expected index 06e4d235a..6f56b6e92 100644 --- a/tests/dbus/bug782719_server.c-expected +++ b/tests/dbus/bug782719_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug783002_client.c-expected b/tests/dbus/bug783002_client.c-expected index f7a1d8f72..c94a87b9a 100644 --- a/tests/dbus/bug783002_client.c-expected +++ b/tests/dbus/bug783002_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected index d8a681b7e..512301c99 100644 --- a/tests/dbus/bug783002_server.c-expected +++ b/tests/dbus/bug783002_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/bug792277.c-expected b/tests/dbus/bug792277.c-expected index 6d7b093b7..cd5c787e1 100644 --- a/tests/dbus/bug792277.c-expected +++ b/tests/dbus/bug792277.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/connection_client.c-expected b/tests/dbus/connection_client.c-expected index e409fca79..2d89377ac 100644 --- a/tests/dbus/connection_client.c-expected +++ b/tests/dbus/connection_client.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/connection_server.c-expected b/tests/dbus/connection_server.c-expected index 448ed89aa..17a3cd88b 100644 --- a/tests/dbus/connection_server.c-expected +++ b/tests/dbus/connection_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/dicts_client.c-expected b/tests/dbus/dicts_client.c-expected index 5158c03b8..e57f805f2 100644 --- a/tests/dbus/dicts_client.c-expected +++ b/tests/dbus/dicts_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/dicts_server.c-expected b/tests/dbus/dicts_server.c-expected index f77e6e4d4..ba132338c 100644 --- a/tests/dbus/dicts_server.c-expected +++ b/tests/dbus/dicts_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/dynamic-method_client.c-expected b/tests/dbus/dynamic-method_client.c-expected index 8596b733b..b8ad7da7e 100644 --- a/tests/dbus/dynamic-method_client.c-expected +++ b/tests/dbus/dynamic-method_client.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected index c8a9e7c10..6429cb089 100644 --- a/tests/dbus/dynamic-method_server.c-expected +++ b/tests/dbus/dynamic-method_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/enum-string-marshalling.c-expected b/tests/dbus/enum-string-marshalling.c-expected index b1e86ed60..dc0e284ed 100644 --- a/tests/dbus/enum-string-marshalling.c-expected +++ b/tests/dbus/enum-string-marshalling.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected index 7debe51c3..228f7ae99 100644 --- a/tests/dbus/errors_client.c-expected +++ b/tests/dbus/errors_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected index b1bc41ccf..158a642b8 100644 --- a/tests/dbus/errors_server.c-expected +++ b/tests/dbus/errors_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor-async_client.c-expected b/tests/dbus/filedescriptor-async_client.c-expected index d37d38c45..7b28d3ae3 100644 --- a/tests/dbus/filedescriptor-async_client.c-expected +++ b/tests/dbus/filedescriptor-async_client.c-expected @@ -10,9 +10,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor-async_server.c-expected b/tests/dbus/filedescriptor-async_server.c-expected index 3522da6c1..daae3e221 100644 --- a/tests/dbus/filedescriptor-async_server.c-expected +++ b/tests/dbus/filedescriptor-async_server.c-expected @@ -11,9 +11,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -21,7 +20,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -29,9 +27,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -39,7 +37,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -54,6 +51,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor-errors_client.c-expected b/tests/dbus/filedescriptor-errors_client.c-expected index 92fe88617..e8e947b0a 100644 --- a/tests/dbus/filedescriptor-errors_client.c-expected +++ b/tests/dbus/filedescriptor-errors_client.c-expected @@ -12,9 +12,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -22,7 +21,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -30,9 +28,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -40,7 +38,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -55,6 +52,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor-errors_server.c-expected b/tests/dbus/filedescriptor-errors_server.c-expected index d18e804e2..33f3053bc 100644 --- a/tests/dbus/filedescriptor-errors_server.c-expected +++ b/tests/dbus/filedescriptor-errors_server.c-expected @@ -12,9 +12,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -22,7 +21,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -30,9 +28,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -40,7 +38,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -55,6 +52,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor_client.c-expected b/tests/dbus/filedescriptor_client.c-expected index ff4441534..7f34b48da 100644 --- a/tests/dbus/filedescriptor_client.c-expected +++ b/tests/dbus/filedescriptor_client.c-expected @@ -10,9 +10,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected index 70a081401..366f76261 100644 --- a/tests/dbus/filedescriptor_server.c-expected +++ b/tests/dbus/filedescriptor_server.c-expected @@ -11,9 +11,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -21,7 +20,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -29,9 +27,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -39,7 +37,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -54,6 +51,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/generics_client.c-expected b/tests/dbus/generics_client.c-expected index 31401bc3a..6b6b4864f 100644 --- a/tests/dbus/generics_client.c-expected +++ b/tests/dbus/generics_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/generics_server.c-expected b/tests/dbus/generics_server.c-expected index 77387eeb2..39dfe05a5 100644 --- a/tests/dbus/generics_server.c-expected +++ b/tests/dbus/generics_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/interface-info_client.c-expected b/tests/dbus/interface-info_client.c-expected index 7507d24a3..78a62c405 100644 --- a/tests/dbus/interface-info_client.c-expected +++ b/tests/dbus/interface-info_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/interface-info_server.c-expected b/tests/dbus/interface-info_server.c-expected index 28c2515d2..1b59f6e41 100644 --- a/tests/dbus/interface-info_server.c-expected +++ b/tests/dbus/interface-info_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected index c5d8b4e45..38b10813f 100644 --- a/tests/dbus/no-reply_client.c-expected +++ b/tests/dbus/no-reply_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/no-reply_server.c-expected b/tests/dbus/no-reply_server.c-expected index aab3f207f..db41ef18a 100644 --- a/tests/dbus/no-reply_server.c-expected +++ b/tests/dbus/no-reply_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/rawvariants_client.c-expected b/tests/dbus/rawvariants_client.c-expected index 5a2309564..5c8bd0368 100644 --- a/tests/dbus/rawvariants_client.c-expected +++ b/tests/dbus/rawvariants_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/rawvariants_server.c-expected b/tests/dbus/rawvariants_server.c-expected index b3ae68146..70131a0f9 100644 --- a/tests/dbus/rawvariants_server.c-expected +++ b/tests/dbus/rawvariants_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/signals_client.c-expected b/tests/dbus/signals_client.c-expected index 92c2f5423..70705159b 100644 --- a/tests/dbus/signals_client.c-expected +++ b/tests/dbus/signals_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/signals_server.c-expected b/tests/dbus/signals_server.c-expected index 6f9b0adb9..f5329f3e4 100644 --- a/tests/dbus/signals_server.c-expected +++ b/tests/dbus/signals_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/structs_client.c-expected b/tests/dbus/structs_client.c-expected index adb40d2d3..0ad65df8a 100644 --- a/tests/dbus/structs_client.c-expected +++ b/tests/dbus/structs_client.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/dbus/structs_server.c-expected b/tests/dbus/structs_server.c-expected index 62d878beb..5e6d010f5 100644 --- a/tests/dbus/structs_server.c-expected +++ b/tests/dbus/structs_server.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug539166.c-expected b/tests/delegates/bug539166.c-expected index 68e23922f..4c9fccc24 100644 --- a/tests/delegates/bug539166.c-expected +++ b/tests/delegates/bug539166.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug595610.c-expected b/tests/delegates/bug595610.c-expected index 81779f710..506dd4228 100644 --- a/tests/delegates/bug595610.c-expected +++ b/tests/delegates/bug595610.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug595639.c-expected b/tests/delegates/bug595639.c-expected index ec237496f..51031d2a8 100644 --- a/tests/delegates/bug595639.c-expected +++ b/tests/delegates/bug595639.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug638415.c-expected b/tests/delegates/bug638415.c-expected index 5fb439914..66aa7ae6e 100644 --- a/tests/delegates/bug638415.c-expected +++ b/tests/delegates/bug638415.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug639751.c-expected b/tests/delegates/bug639751.c-expected index 412c5daa3..e69eaae07 100644 --- a/tests/delegates/bug639751.c-expected +++ b/tests/delegates/bug639751.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug659778.c-expected b/tests/delegates/bug659778.c-expected index 42ad7922b..e7b9d61d0 100644 --- a/tests/delegates/bug659778.c-expected +++ b/tests/delegates/bug659778.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug683925.c-expected b/tests/delegates/bug683925.c-expected index 826d48a0d..02ab34c16 100644 --- a/tests/delegates/bug683925.c-expected +++ b/tests/delegates/bug683925.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug703804.c-expected b/tests/delegates/bug703804.c-expected index a87fbe734..0eb79bf82 100644 --- a/tests/delegates/bug703804.c-expected +++ b/tests/delegates/bug703804.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/bug761360.c-expected b/tests/delegates/bug761360.c-expected index c9fc8bf91..facc22d77 100644 --- a/tests/delegates/bug761360.c-expected +++ b/tests/delegates/bug761360.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef gint* (*ArrayReturnFunc) (gint* result_length1, gpointer user_data); diff --git a/tests/delegates/bug792077.c-expected b/tests/delegates/bug792077.c-expected index 0174fc002..5720b27ac 100644 --- a/tests/delegates/bug792077.c-expected +++ b/tests/delegates/bug792077.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/casting.c-expected b/tests/delegates/casting.c-expected index b4cfb95da..e67921cc2 100644 --- a/tests/delegates/casting.c-expected +++ b/tests/delegates/casting.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/class-field-initializer.c-expected b/tests/delegates/class-field-initializer.c-expected index fa10e08a1..00dc25a22 100644 --- a/tests/delegates/class-field-initializer.c-expected +++ b/tests/delegates/class-field-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/compatible.c-expected b/tests/delegates/compatible.c-expected index e041e713a..5efadf911 100644 --- a/tests/delegates/compatible.c-expected +++ b/tests/delegates/compatible.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/delegate-recusive.c-expected b/tests/delegates/delegate-recusive.c-expected index 29e578467..2aa31af79 100644 --- a/tests/delegates/delegate-recusive.c-expected +++ b/tests/delegates/delegate-recusive.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef GCallback (*MamanSelfCallback) (GCallback scb, gpointer* result_target, GDestroyNotify* result_target_destroy_notify, gpointer user_data); diff --git a/tests/delegates/delegate_only.c-expected b/tests/delegates/delegate_only.c-expected index 1ba1a3c92..983559388 100644 --- a/tests/delegates/delegate_only.c-expected +++ b/tests/delegates/delegate_only.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef void (*FooFunc) (gpointer user_data); diff --git a/tests/delegates/delegates.c-expected b/tests/delegates/delegates.c-expected index 775852564..c6db7cc10 100644 --- a/tests/delegates/delegates.c-expected +++ b/tests/delegates/delegates.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/error-pos.c-expected b/tests/delegates/error-pos.c-expected index 94fee3a76..1f4f5ad49 100644 --- a/tests/delegates/error-pos.c-expected +++ b/tests/delegates/error-pos.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/fields-no-target.c-expected b/tests/delegates/fields-no-target.c-expected index cb3bc3128..3db4a752e 100644 --- a/tests/delegates/fields-no-target.c-expected +++ b/tests/delegates/fields-no-target.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/fields.c-expected b/tests/delegates/fields.c-expected index ae5d17802..6e872013c 100644 --- a/tests/delegates/fields.c-expected +++ b/tests/delegates/fields.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/gclosure-conversion.c-expected b/tests/delegates/gclosure-conversion.c-expected index 5dce84a7e..011d6e543 100644 --- a/tests/delegates/gclosure-conversion.c-expected +++ b/tests/delegates/gclosure-conversion.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/implicit-local-variable.c-expected b/tests/delegates/implicit-local-variable.c-expected index 2b59c5ab0..909013177 100644 --- a/tests/delegates/implicit-local-variable.c-expected +++ b/tests/delegates/implicit-local-variable.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef gboolean (*GSourceDispatchFunc) (GSource* source, GSourceFunc _callback, gpointer _callback_target); diff --git a/tests/delegates/lambda-mixed-instance-static.c-expected b/tests/delegates/lambda-mixed-instance-static.c-expected index 0e6cb087f..895ea13fc 100644 --- a/tests/delegates/lambda-mixed-instance-static.c-expected +++ b/tests/delegates/lambda-mixed-instance-static.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/lambda-shared-closure.c-expected b/tests/delegates/lambda-shared-closure.c-expected index 5a3727e82..da60f619a 100644 --- a/tests/delegates/lambda-shared-closure.c-expected +++ b/tests/delegates/lambda-shared-closure.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/member-target-destroy-2.c-expected b/tests/delegates/member-target-destroy-2.c-expected index c4637e685..de8e9f2f8 100644 --- a/tests/delegates/member-target-destroy-2.c-expected +++ b/tests/delegates/member-target-destroy-2.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/member-target-destroy.c-expected b/tests/delegates/member-target-destroy.c-expected index 6a08a3e84..c6e109ec1 100644 --- a/tests/delegates/member-target-destroy.c-expected +++ b/tests/delegates/member-target-destroy.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/params-array-with-throws.c-expected b/tests/delegates/params-array-with-throws.c-expected index 8424557b6..5d7a8a61b 100644 --- a/tests/delegates/params-array-with-throws.c-expected +++ b/tests/delegates/params-array-with-throws.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/params-array.c-expected b/tests/delegates/params-array.c-expected index 0cb59e4ee..b5a71a99a 100644 --- a/tests/delegates/params-array.c-expected +++ b/tests/delegates/params-array.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/reference_transfer.c-expected b/tests/delegates/reference_transfer.c-expected index 4cf262bea..4fa1d37f8 100644 --- a/tests/delegates/reference_transfer.c-expected +++ b/tests/delegates/reference_transfer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/return-array-null-terminated.c-expected b/tests/delegates/return-array-null-terminated.c-expected index 1c407d146..a7d95104e 100644 --- a/tests/delegates/return-array-null-terminated.c-expected +++ b/tests/delegates/return-array-null-terminated.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/variadic.c-expected b/tests/delegates/variadic.c-expected index c33e1ed9a..ea64cf624 100644 --- a/tests/delegates/variadic.c-expected +++ b/tests/delegates/variadic.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/delegates/wrapper.c-expected b/tests/delegates/wrapper.c-expected index 3feb86204..f6a8f216e 100644 --- a/tests/delegates/wrapper.c-expected +++ b/tests/delegates/wrapper.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/bug614424.c-expected b/tests/enums/bug614424.c-expected index 795349493..c0f01b8e0 100644 --- a/tests/enums/bug614424.c-expected +++ b/tests/enums/bug614424.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/bug666035.c-expected b/tests/enums/bug666035.c-expected index 9dc16ac6b..5718a18df 100644 --- a/tests/enums/bug666035.c-expected +++ b/tests/enums/bug666035.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/bug673879.c-expected b/tests/enums/bug673879.c-expected index 52bcfc089..8336c13f9 100644 --- a/tests/enums/bug673879.c-expected +++ b/tests/enums/bug673879.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/bug763831.c-expected b/tests/enums/bug763831.c-expected index fad16b7e1..9fb0a6439 100644 --- a/tests/enums/bug763831.c-expected +++ b/tests/enums/bug763831.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/bug780050.c-expected b/tests/enums/bug780050.c-expected index 9daa0d79f..04ce60c01 100644 --- a/tests/enums/bug780050.c-expected +++ b/tests/enums/bug780050.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/default-gtype.c-expected b/tests/enums/default-gtype.c-expected index d74931103..b6c9f86a7 100644 --- a/tests/enums/default-gtype.c-expected +++ b/tests/enums/default-gtype.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/enums/enum-boxed.c-expected b/tests/enums/enum-boxed.c-expected index a61941d56..c1a6fc1c0 100644 --- a/tests/enums/enum-boxed.c-expected +++ b/tests/enums/enum-boxed.c-expected @@ -8,9 +8,8 @@ #define FOO FOO_BAR #define BAR BAR_FOO #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/enum-no-gtype.c-expected b/tests/enums/enum-no-gtype.c-expected index 0c64cd21f..b853f9527 100644 --- a/tests/enums/enum-no-gtype.c-expected +++ b/tests/enums/enum-no-gtype.c-expected @@ -2,9 +2,8 @@ * generated from enums_enum_no_gtype.vala, do not modify */ #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -12,7 +11,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -20,9 +18,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -30,7 +28,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -45,6 +42,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/enums/enum_only.c-expected b/tests/enums/enum_only.c-expected index 1bc0e552d..8ea9cfb4e 100644 --- a/tests/enums/enum_only.c-expected +++ b/tests/enums/enum_only.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/enums.c-expected b/tests/enums/enums.c-expected index 0c4f3a0df..b61c8ec55 100644 --- a/tests/enums/enums.c-expected +++ b/tests/enums/enums.c-expected @@ -7,9 +7,8 @@ #define MAMAN_FOOISH_FOO 2 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/flags.c-expected b/tests/enums/flags.c-expected index 2643899ab..c04c5ef10 100644 --- a/tests/enums/flags.c-expected +++ b/tests/enums/flags.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/from-0-literal.c-expected b/tests/enums/from-0-literal.c-expected index 50c23a5f8..c7abf3374 100644 --- a/tests/enums/from-0-literal.c-expected +++ b/tests/enums/from-0-literal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/in-inference.c-expected b/tests/enums/in-inference.c-expected index 07f9612e8..082e1fd59 100644 --- a/tests/enums/in-inference.c-expected +++ b/tests/enums/in-inference.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/no_gtype_to_string.c-expected b/tests/enums/no_gtype_to_string.c-expected index 9efe2ce4c..ed482596f 100644 --- a/tests/enums/no_gtype_to_string.c-expected +++ b/tests/enums/no_gtype_to_string.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/enums/switch.c-expected b/tests/enums/switch.c-expected index 9419ab99c..de4f27ec0 100644 --- a/tests/enums/switch.c-expected +++ b/tests/enums/switch.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/enums/unsafe-assignment.c-expected b/tests/enums/unsafe-assignment.c-expected index 473d7038f..35d3f19c8 100644 --- a/tests/enums/unsafe-assignment.c-expected +++ b/tests/enums/unsafe-assignment.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug567181.c-expected b/tests/errors/bug567181.c-expected index e963e3f90..356270f42 100644 --- a/tests/errors/bug567181.c-expected +++ b/tests/errors/bug567181.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug579101.c-expected b/tests/errors/bug579101.c-expected index 0308c363e..5af05f757 100644 --- a/tests/errors/bug579101.c-expected +++ b/tests/errors/bug579101.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug596228.c-expected b/tests/errors/bug596228.c-expected index dc06f6381..535fe2224 100644 --- a/tests/errors/bug596228.c-expected +++ b/tests/errors/bug596228.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug623049.c-expected b/tests/errors/bug623049.c-expected index af8a3eee0..f6388ea2e 100644 --- a/tests/errors/bug623049.c-expected +++ b/tests/errors/bug623049.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug627090.c-expected b/tests/errors/bug627090.c-expected index 7646e0de2..8dfb459c9 100644 --- a/tests/errors/bug627090.c-expected +++ b/tests/errors/bug627090.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug639589.c-expected b/tests/errors/bug639589.c-expected index f5a4497e3..99d98e005 100644 --- a/tests/errors/bug639589.c-expected +++ b/tests/errors/bug639589.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug651145.c-expected b/tests/errors/bug651145.c-expected index 1e755729e..2327a2921 100644 --- a/tests/errors/bug651145.c-expected +++ b/tests/errors/bug651145.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/errors/bug762377.c-expected b/tests/errors/bug762377.c-expected index c56998e25..0c5d36415 100644 --- a/tests/errors/bug762377.c-expected +++ b/tests/errors/bug762377.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/bug778224.c-expected b/tests/errors/bug778224.c-expected index 0186fde0d..174440d34 100644 --- a/tests/errors/bug778224.c-expected +++ b/tests/errors/bug778224.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/catch-error-code.c-expected b/tests/errors/catch-error-code.c-expected index 1e9b8f8c9..2c513afd7 100644 --- a/tests/errors/catch-error-code.c-expected +++ b/tests/errors/catch-error-code.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/catch-in-finally.c-expected b/tests/errors/catch-in-finally.c-expected index ff8c701f1..0d3211f5d 100644 --- a/tests/errors/catch-in-finally.c-expected +++ b/tests/errors/catch-in-finally.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/default-gtype.c-expected b/tests/errors/default-gtype.c-expected index ee1c45ddd..67b8bea70 100644 --- a/tests/errors/default-gtype.c-expected +++ b/tests/errors/default-gtype.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/delegate-throws-error-code.c-expected b/tests/errors/delegate-throws-error-code.c-expected index affa8254c..1254304a4 100644 --- a/tests/errors/delegate-throws-error-code.c-expected +++ b/tests/errors/delegate-throws-error-code.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/errorcode.c-expected b/tests/errors/errorcode.c-expected index 72a4ab800..04e11922b 100644 --- a/tests/errors/errorcode.c-expected +++ b/tests/errors/errorcode.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/errordomain-static-method.c-expected b/tests/errors/errordomain-static-method.c-expected index 89577b774..fe94a39cb 100644 --- a/tests/errors/errordomain-static-method.c-expected +++ b/tests/errors/errordomain-static-method.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/errordomain.c-expected b/tests/errors/errordomain.c-expected index cbf461e2f..b0a42606e 100644 --- a/tests/errors/errordomain.c-expected +++ b/tests/errors/errordomain.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/errors.c-expected b/tests/errors/errors.c-expected index 96903beaa..164e77976 100644 --- a/tests/errors/errors.c-expected +++ b/tests/errors/errors.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/loops.c-expected b/tests/errors/loops.c-expected index 694335c98..439c23cdf 100644 --- a/tests/errors/loops.c-expected +++ b/tests/errors/loops.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/method-throws-error-code.c-expected b/tests/errors/method-throws-error-code.c-expected index 6be129b20..7a1f1cd84 100644 --- a/tests/errors/method-throws-error-code.c-expected +++ b/tests/errors/method-throws-error-code.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/method-throws.c-expected b/tests/errors/method-throws.c-expected index 551b2e717..a75cdb5c5 100644 --- a/tests/errors/method-throws.c-expected +++ b/tests/errors/method-throws.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/errors/unhandled.c-expected b/tests/errors/unhandled.c-expected index 1781d57e9..58b829997 100644 --- a/tests/errors/unhandled.c-expected +++ b/tests/errors/unhandled.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/arrays.c-expected b/tests/generics/arrays.c-expected index 8c56dfde8..2186c27c3 100644 --- a/tests/generics/arrays.c-expected +++ b/tests/generics/arrays.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/bug640330.c-expected b/tests/generics/bug640330.c-expected index 60a8fdd66..22b40b3c1 100644 --- a/tests/generics/bug640330.c-expected +++ b/tests/generics/bug640330.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/bug694765-1.c-expected b/tests/generics/bug694765-1.c-expected index 267b57d22..198013104 100644 --- a/tests/generics/bug694765-1.c-expected +++ b/tests/generics/bug694765-1.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/bug694765-2.c-expected b/tests/generics/bug694765-2.c-expected index 1a44ec874..91d6edd9d 100644 --- a/tests/generics/bug694765-2.c-expected +++ b/tests/generics/bug694765-2.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/bug694765-3.c-expected b/tests/generics/bug694765-3.c-expected index 68772ad98..25f56fe5f 100644 --- a/tests/generics/bug694765-3.c-expected +++ b/tests/generics/bug694765-3.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) diff --git a/tests/generics/class-property-override.c-expected b/tests/generics/class-property-override.c-expected index 85e0c8047..8acde423f 100644 --- a/tests/generics/class-property-override.c-expected +++ b/tests/generics/class-property-override.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/constructor-chain-up.c-expected b/tests/generics/constructor-chain-up.c-expected index 386e3cf3d..8199055cb 100644 --- a/tests/generics/constructor-chain-up.c-expected +++ b/tests/generics/constructor-chain-up.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/floating-type-cast.c-expected b/tests/generics/floating-type-cast.c-expected index bb460d845..bf3b13370 100644 --- a/tests/generics/floating-type-cast.c-expected +++ b/tests/generics/floating-type-cast.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/foreach-iterator-nullable.c-expected b/tests/generics/foreach-iterator-nullable.c-expected index 41bc2e047..bb78313ee 100644 --- a/tests/generics/foreach-iterator-nullable.c-expected +++ b/tests/generics/foreach-iterator-nullable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) diff --git a/tests/generics/inference-argument-may-fail-2.c-expected b/tests/generics/inference-argument-may-fail-2.c-expected index 368cba8fd..b873c2503 100644 --- a/tests/generics/inference-argument-may-fail-2.c-expected +++ b/tests/generics/inference-argument-may-fail-2.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/inference-argument-may-fail.c-expected b/tests/generics/inference-argument-may-fail.c-expected index 91bee861a..0dc7b979c 100644 --- a/tests/generics/inference-argument-may-fail.c-expected +++ b/tests/generics/inference-argument-may-fail.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/inference-static-function.c-expected b/tests/generics/inference-static-function.c-expected index 3f15c0de2..cff05f200 100644 --- a/tests/generics/inference-static-function.c-expected +++ b/tests/generics/inference-static-function.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/integer-member-access.c-expected b/tests/generics/integer-member-access.c-expected index c777428f4..29c253945 100644 --- a/tests/generics/integer-member-access.c-expected +++ b/tests/generics/integer-member-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/integer-type-cast-return.c-expected b/tests/generics/integer-type-cast-return.c-expected index e67543560..ce5061167 100644 --- a/tests/generics/integer-type-cast-return.c-expected +++ b/tests/generics/integer-type-cast-return.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/integer-type-cast.c-expected b/tests/generics/integer-type-cast.c-expected index d52b5dc33..da47ab954 100644 --- a/tests/generics/integer-type-cast.c-expected +++ b/tests/generics/integer-type-cast.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/interface-property-impl.c-expected b/tests/generics/interface-property-impl.c-expected index bab1fe59f..b77507840 100644 --- a/tests/generics/interface-property-impl.c-expected +++ b/tests/generics/interface-property-impl.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/member-dup-destroy.c-expected b/tests/generics/member-dup-destroy.c-expected index cd9e4c55a..1d78837f4 100644 --- a/tests/generics/member-dup-destroy.c-expected +++ b/tests/generics/member-dup-destroy.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/method-return-cast.c-expected b/tests/generics/method-return-cast.c-expected index 3ebdd0e85..c4459d073 100644 --- a/tests/generics/method-return-cast.c-expected +++ b/tests/generics/method-return-cast.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/method-to-delegate-2.c-expected b/tests/generics/method-to-delegate-2.c-expected index 1b5c6a7ca..8c5bb22a0 100644 --- a/tests/generics/method-to-delegate-2.c-expected +++ b/tests/generics/method-to-delegate-2.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/method-to-delegate.c-expected b/tests/generics/method-to-delegate.c-expected index 04d45dfde..0fa3afc27 100644 --- a/tests/generics/method-to-delegate.c-expected +++ b/tests/generics/method-to-delegate.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/null-type.c-expected b/tests/generics/null-type.c-expected index 012c8dd5a..1ddba7d98 100644 --- a/tests/generics/null-type.c-expected +++ b/tests/generics/null-type.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-in-cast.c-expected b/tests/generics/parameter-in-cast.c-expected index 60b1deda0..f0605c7ad 100644 --- a/tests/generics/parameter-in-cast.c-expected +++ b/tests/generics/parameter-in-cast.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-out-cast.c-expected b/tests/generics/parameter-out-cast.c-expected index 4508cc6cc..e970e445f 100644 --- a/tests/generics/parameter-out-cast.c-expected +++ b/tests/generics/parameter-out-cast.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-sizeof-initializer-2.c-expected b/tests/generics/parameter-sizeof-initializer-2.c-expected index 62cfa28ff..43490e6f6 100644 --- a/tests/generics/parameter-sizeof-initializer-2.c-expected +++ b/tests/generics/parameter-sizeof-initializer-2.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-sizeof-initializer.c-expected b/tests/generics/parameter-sizeof-initializer.c-expected index be61f4439..d68fe92d2 100644 --- a/tests/generics/parameter-sizeof-initializer.c-expected +++ b/tests/generics/parameter-sizeof-initializer.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-typeof-initializer.c-expected b/tests/generics/parameter-typeof-initializer.c-expected index b1c3f5aae..c703ba8f0 100644 --- a/tests/generics/parameter-typeof-initializer.c-expected +++ b/tests/generics/parameter-typeof-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/parameter-typeof.c-expected b/tests/generics/parameter-typeof.c-expected index 6e39b794b..3479a71c4 100644 --- a/tests/generics/parameter-typeof.c-expected +++ b/tests/generics/parameter-typeof.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/property-gobject-set.c-expected b/tests/generics/property-gobject-set.c-expected index 548f2a590..45e4fbfcc 100644 --- a/tests/generics/property-gobject-set.c-expected +++ b/tests/generics/property-gobject-set.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/property-int-cast.c-expected b/tests/generics/property-int-cast.c-expected index a88307936..927f4be58 100644 --- a/tests/generics/property-int-cast.c-expected +++ b/tests/generics/property-int-cast.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/reference-transfer.c-expected b/tests/generics/reference-transfer.c-expected index 65b4bd8e5..48b650e44 100644 --- a/tests/generics/reference-transfer.c-expected +++ b/tests/generics/reference-transfer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/string-literal-comparison.c-expected b/tests/generics/string-literal-comparison.c-expected index b349a51a3..b411bd02d 100644 --- a/tests/generics/string-literal-comparison.c-expected +++ b/tests/generics/string-literal-comparison.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/type-parameter-properties.c-expected b/tests/generics/type-parameter-properties.c-expected index b544dd49e..f282a61bd 100644 --- a/tests/generics/type-parameter-properties.c-expected +++ b/tests/generics/type-parameter-properties.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/type-parameter-property-clash.c-expected b/tests/generics/type-parameter-property-clash.c-expected index cb9714744..48cd3db9b 100644 --- a/tests/generics/type-parameter-property-clash.c-expected +++ b/tests/generics/type-parameter-property-clash.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/generics/value-pointer-type-access.c-expected b/tests/generics/value-pointer-type-access.c-expected index 791058d13..e5b13a29d 100644 --- a/tests/generics/value-pointer-type-access.c-expected +++ b/tests/generics/value-pointer-type-access.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/attributes.c-expected b/tests/genie/attributes.c-expected index f8537b327..634137dbc 100644 --- a/tests/genie/attributes.c-expected +++ b/tests/genie/attributes.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/case.c-expected b/tests/genie/case.c-expected index e6adf8627..30e539d9a 100644 --- a/tests/genie/case.c-expected +++ b/tests/genie/case.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (gchar** args, diff --git a/tests/genie/class-abstract.c-expected b/tests/genie/class-abstract.c-expected index bc1bdcc94..adf972b03 100644 --- a/tests/genie/class-abstract.c-expected +++ b/tests/genie/class-abstract.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/class-field.c-expected b/tests/genie/class-field.c-expected index b0c48349f..7cc4c3fca 100644 --- a/tests/genie/class-field.c-expected +++ b/tests/genie/class-field.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/class-init.c-expected b/tests/genie/class-init.c-expected index 8b46fda25..8dc2e18ee 100644 --- a/tests/genie/class-init.c-expected +++ b/tests/genie/class-init.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/class-property.c-expected b/tests/genie/class-property.c-expected index dbd109c58..c1b784f70 100644 --- a/tests/genie/class-property.c-expected +++ b/tests/genie/class-property.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/class-signal.c-expected b/tests/genie/class-signal.c-expected index 876657b55..5135865b3 100644 --- a/tests/genie/class-signal.c-expected +++ b/tests/genie/class-signal.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/class.c-expected b/tests/genie/class.c-expected index b8caeff76..8bc13ae6c 100644 --- a/tests/genie/class.c-expected +++ b/tests/genie/class.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/constant.c-expected b/tests/genie/constant.c-expected index 4ea80eab2..5de2eb798 100644 --- a/tests/genie/constant.c-expected +++ b/tests/genie/constant.c-expected @@ -7,9 +7,8 @@ #define TEST 23 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if-do.c-expected b/tests/genie/control-flow-if-do.c-expected index cbf03880e..e070cef47 100644 --- a/tests/genie/control-flow-if-do.c-expected +++ b/tests/genie/control-flow-if-do.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if-else-if.c-expected b/tests/genie/control-flow-if-else-if.c-expected index 88e5ea0ac..1001acae1 100644 --- a/tests/genie/control-flow-if-else-if.c-expected +++ b/tests/genie/control-flow-if-else-if.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if-else.c-expected b/tests/genie/control-flow-if-else.c-expected index 268c68ee0..b86bea3e4 100644 --- a/tests/genie/control-flow-if-else.c-expected +++ b/tests/genie/control-flow-if-else.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if-greater-than.c-expected b/tests/genie/control-flow-if-greater-than.c-expected index 4dbb8437c..13bbb7266 100644 --- a/tests/genie/control-flow-if-greater-than.c-expected +++ b/tests/genie/control-flow-if-greater-than.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if-identity.c-expected b/tests/genie/control-flow-if-identity.c-expected index cc652b33f..64665b7df 100644 --- a/tests/genie/control-flow-if-identity.c-expected +++ b/tests/genie/control-flow-if-identity.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/control-flow-if-less-than.c-expected b/tests/genie/control-flow-if-less-than.c-expected index 71798eb1d..ec41a8e83 100644 --- a/tests/genie/control-flow-if-less-than.c-expected +++ b/tests/genie/control-flow-if-less-than.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/control-flow-if.c-expected b/tests/genie/control-flow-if.c-expected index a3f77d06c..5a30319ed 100644 --- a/tests/genie/control-flow-if.c-expected +++ b/tests/genie/control-flow-if.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/do-while.c-expected b/tests/genie/do-while.c-expected index 07a70e22d..63f0b4af9 100644 --- a/tests/genie/do-while.c-expected +++ b/tests/genie/do-while.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (gchar** args, diff --git a/tests/genie/enum-with-keyword-values.c-expected b/tests/genie/enum-with-keyword-values.c-expected index 79b73ac2a..56da218ae 100644 --- a/tests/genie/enum-with-keyword-values.c-expected +++ b/tests/genie/enum-with-keyword-values.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/enum.c-expected b/tests/genie/enum.c-expected index e22c70024..1ef92be47 100644 --- a/tests/genie/enum.c-expected +++ b/tests/genie/enum.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/exception.c-expected b/tests/genie/exception.c-expected index a60b227a3..9009c882b 100644 --- a/tests/genie/exception.c-expected +++ b/tests/genie/exception.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/for-downto.c-expected b/tests/genie/for-downto.c-expected index 237c501a7..eaa3e12b0 100644 --- a/tests/genie/for-downto.c-expected +++ b/tests/genie/for-downto.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/for-in.c-expected b/tests/genie/for-in.c-expected index 0605434ed..e87b78bd1 100644 --- a/tests/genie/for-in.c-expected +++ b/tests/genie/for-in.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/for-to.c-expected b/tests/genie/for-to.c-expected index 10d9a26ba..7bb773cd1 100644 --- a/tests/genie/for-to.c-expected +++ b/tests/genie/for-to.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/function-returns-closure.c-expected b/tests/genie/function-returns-closure.c-expected index 1adb5f0f3..964758c72 100644 --- a/tests/genie/function-returns-closure.c-expected +++ b/tests/genie/function-returns-closure.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/function-with-argument.c-expected b/tests/genie/function-with-argument.c-expected index 664528d39..74bb65f78 100644 --- a/tests/genie/function-with-argument.c-expected +++ b/tests/genie/function-with-argument.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/function-with-return-value.c-expected b/tests/genie/function-with-return-value.c-expected index 72cf899dd..6ccba1e81 100644 --- a/tests/genie/function-with-return-value.c-expected +++ b/tests/genie/function-with-return-value.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/function.c-expected b/tests/genie/function.c-expected index d95afcaab..2093f1378 100644 --- a/tests/genie/function.c-expected +++ b/tests/genie/function.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/indentation-with-spaces.c-expected b/tests/genie/indentation-with-spaces.c-expected index aa0bea458..7af4aa9df 100644 --- a/tests/genie/indentation-with-spaces.c-expected +++ b/tests/genie/indentation-with-spaces.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/init-int.c-expected b/tests/genie/init-int.c-expected index 57324306b..6747ed6cf 100644 --- a/tests/genie/init-int.c-expected +++ b/tests/genie/init-int.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static gint _vala_main (gchar** args, diff --git a/tests/genie/init.c-expected b/tests/genie/init.c-expected index 78d0420f2..4b1c591be 100644 --- a/tests/genie/init.c-expected +++ b/tests/genie/init.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/initializer-list.c-expected b/tests/genie/initializer-list.c-expected index 95529b45a..d6920b1a8 100644 --- a/tests/genie/initializer-list.c-expected +++ b/tests/genie/initializer-list.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/interface.c-expected b/tests/genie/interface.c-expected index b85507b9b..ecb9fc22e 100644 --- a/tests/genie/interface.c-expected +++ b/tests/genie/interface.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/literal-boolean-assignment.c-expected b/tests/genie/literal-boolean-assignment.c-expected index 53a7176a1..77c11a90f 100644 --- a/tests/genie/literal-boolean-assignment.c-expected +++ b/tests/genie/literal-boolean-assignment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-boolean.c-expected b/tests/genie/literal-boolean.c-expected index 02d1f2a6c..06cb2a23e 100644 --- a/tests/genie/literal-boolean.c-expected +++ b/tests/genie/literal-boolean.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-character.c-expected b/tests/genie/literal-character.c-expected index cf4e6fdc8..45cbe5e76 100644 --- a/tests/genie/literal-character.c-expected +++ b/tests/genie/literal-character.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-hexadecimal.c-expected b/tests/genie/literal-hexadecimal.c-expected index 6d696e2df..eea50f401 100644 --- a/tests/genie/literal-hexadecimal.c-expected +++ b/tests/genie/literal-hexadecimal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-integer-long-long-suffix.c-expected b/tests/genie/literal-integer-long-long-suffix.c-expected index 8f96dc5be..99de8bb0f 100644 --- a/tests/genie/literal-integer-long-long-suffix.c-expected +++ b/tests/genie/literal-integer-long-long-suffix.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-integer.c-expected b/tests/genie/literal-integer.c-expected index 6fd439f59..b121c7384 100644 --- a/tests/genie/literal-integer.c-expected +++ b/tests/genie/literal-integer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-null.c-expected b/tests/genie/literal-null.c-expected index 529d2d633..6ee6d42e8 100644 --- a/tests/genie/literal-null.c-expected +++ b/tests/genie/literal-null.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/literal-octal.c-expected b/tests/genie/literal-octal.c-expected index 42c3ed710..fae7961a2 100644 --- a/tests/genie/literal-octal.c-expected +++ b/tests/genie/literal-octal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-real.c-expected b/tests/genie/literal-real.c-expected index 44e2438e5..3c0a905cf 100644 --- a/tests/genie/literal-real.c-expected +++ b/tests/genie/literal-real.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/literal-regex.c-expected b/tests/genie/literal-regex.c-expected index d5335950f..c4f74eab4 100644 --- a/tests/genie/literal-regex.c-expected +++ b/tests/genie/literal-regex.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/literal-template-string.c-expected b/tests/genie/literal-template-string.c-expected index 5a6c32938..cfd30e7ba 100644 --- a/tests/genie/literal-template-string.c-expected +++ b/tests/genie/literal-template-string.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/literal-verbatim-string.c-expected b/tests/genie/literal-verbatim-string.c-expected index b553b9c16..823730727 100644 --- a/tests/genie/literal-verbatim-string.c-expected +++ b/tests/genie/literal-verbatim-string.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/operator-addition.c-expected b/tests/genie/operator-addition.c-expected index 3cab01c25..6d416088f 100644 --- a/tests/genie/operator-addition.c-expected +++ b/tests/genie/operator-addition.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-assignment-combined.c-expected b/tests/genie/operator-assignment-combined.c-expected index 020ea5ad8..560633df8 100644 --- a/tests/genie/operator-assignment-combined.c-expected +++ b/tests/genie/operator-assignment-combined.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-assignment.c-expected b/tests/genie/operator-assignment.c-expected index 3656c32e9..776ef8c92 100644 --- a/tests/genie/operator-assignment.c-expected +++ b/tests/genie/operator-assignment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-and.c-expected b/tests/genie/operator-bitwise-and.c-expected index 2f31ec53d..ad638f5cc 100644 --- a/tests/genie/operator-bitwise-and.c-expected +++ b/tests/genie/operator-bitwise-and.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-left-shift.c-expected b/tests/genie/operator-bitwise-left-shift.c-expected index f042d567a..756f805fb 100644 --- a/tests/genie/operator-bitwise-left-shift.c-expected +++ b/tests/genie/operator-bitwise-left-shift.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-not.c-expected b/tests/genie/operator-bitwise-not.c-expected index 9aa7129b8..ee7292c50 100644 --- a/tests/genie/operator-bitwise-not.c-expected +++ b/tests/genie/operator-bitwise-not.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-or.c-expected b/tests/genie/operator-bitwise-or.c-expected index 0929d0a53..ac091c0d3 100644 --- a/tests/genie/operator-bitwise-or.c-expected +++ b/tests/genie/operator-bitwise-or.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-right-shift.c-expected b/tests/genie/operator-bitwise-right-shift.c-expected index 350a89f46..584b1d72f 100644 --- a/tests/genie/operator-bitwise-right-shift.c-expected +++ b/tests/genie/operator-bitwise-right-shift.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-bitwise-xor.c-expected b/tests/genie/operator-bitwise-xor.c-expected index 537f83181..6c2f7fa9e 100644 --- a/tests/genie/operator-bitwise-xor.c-expected +++ b/tests/genie/operator-bitwise-xor.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-division.c-expected b/tests/genie/operator-division.c-expected index 1f14ee530..daef05a3f 100644 --- a/tests/genie/operator-division.c-expected +++ b/tests/genie/operator-division.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-equal.c-expected b/tests/genie/operator-equal.c-expected index 59df498e8..a2b428bd8 100644 --- a/tests/genie/operator-equal.c-expected +++ b/tests/genie/operator-equal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/operator-greater-than-equal.c-expected b/tests/genie/operator-greater-than-equal.c-expected index 3fc375463..cba75e98f 100644 --- a/tests/genie/operator-greater-than-equal.c-expected +++ b/tests/genie/operator-greater-than-equal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-less-than-equal.c-expected b/tests/genie/operator-less-than-equal.c-expected index 90aa65026..a815f830d 100644 --- a/tests/genie/operator-less-than-equal.c-expected +++ b/tests/genie/operator-less-than-equal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-less-than.c-expected b/tests/genie/operator-less-than.c-expected index 3f7c99893..4b88b5f58 100644 --- a/tests/genie/operator-less-than.c-expected +++ b/tests/genie/operator-less-than.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-logical-and.c-expected b/tests/genie/operator-logical-and.c-expected index 93552e4fc..d2fb5f258 100644 --- a/tests/genie/operator-logical-and.c-expected +++ b/tests/genie/operator-logical-and.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-logical-not.c-expected b/tests/genie/operator-logical-not.c-expected index 39d8c701a..05ef3e4cf 100644 --- a/tests/genie/operator-logical-not.c-expected +++ b/tests/genie/operator-logical-not.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-logical-or.c-expected b/tests/genie/operator-logical-or.c-expected index 2062deab1..ef52d9e4b 100644 --- a/tests/genie/operator-logical-or.c-expected +++ b/tests/genie/operator-logical-or.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-modulo.c-expected b/tests/genie/operator-modulo.c-expected index ef1f1e1b5..a8d4622ab 100644 --- a/tests/genie/operator-modulo.c-expected +++ b/tests/genie/operator-modulo.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-multiply.c-expected b/tests/genie/operator-multiply.c-expected index bf149ccbd..459f61172 100644 --- a/tests/genie/operator-multiply.c-expected +++ b/tests/genie/operator-multiply.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-not-equal.c-expected b/tests/genie/operator-not-equal.c-expected index a528a42c8..eab4077c8 100644 --- a/tests/genie/operator-not-equal.c-expected +++ b/tests/genie/operator-not-equal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/operator-post-decrement.c-expected b/tests/genie/operator-post-decrement.c-expected index 41e62bcc8..95397a43e 100644 --- a/tests/genie/operator-post-decrement.c-expected +++ b/tests/genie/operator-post-decrement.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-post-increment.c-expected b/tests/genie/operator-post-increment.c-expected index a40b63950..fea595d46 100644 --- a/tests/genie/operator-post-increment.c-expected +++ b/tests/genie/operator-post-increment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-pre-decrement.c-expected b/tests/genie/operator-pre-decrement.c-expected index 5764acfbf..82e7ba68b 100644 --- a/tests/genie/operator-pre-decrement.c-expected +++ b/tests/genie/operator-pre-decrement.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-pre-increment.c-expected b/tests/genie/operator-pre-increment.c-expected index 0b8e7cacc..46d91dac1 100644 --- a/tests/genie/operator-pre-increment.c-expected +++ b/tests/genie/operator-pre-increment.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-subtraction.c-expected b/tests/genie/operator-subtraction.c-expected index 486c9fa8b..e1fec17f7 100644 --- a/tests/genie/operator-subtraction.c-expected +++ b/tests/genie/operator-subtraction.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/operator-ternary.c-expected b/tests/genie/operator-ternary.c-expected index c8af96eeb..4fc3e037a 100644 --- a/tests/genie/operator-ternary.c-expected +++ b/tests/genie/operator-ternary.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/operators-greater-than.c-expected b/tests/genie/operators-greater-than.c-expected index 0f635d6be..f14d9f106 100644 --- a/tests/genie/operators-greater-than.c-expected +++ b/tests/genie/operators-greater-than.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser-and-expression.c-expected b/tests/genie/preparser-and-expression.c-expected index 571b61c43..989cce3ca 100644 --- a/tests/genie/preparser-and-expression.c-expected +++ b/tests/genie/preparser-and-expression.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser-elif.c-expected b/tests/genie/preparser-elif.c-expected index 7611f54e0..56ed74d05 100644 --- a/tests/genie/preparser-elif.c-expected +++ b/tests/genie/preparser-elif.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser-equality-expression.c-expected b/tests/genie/preparser-equality-expression.c-expected index 5df99c195..21a6fa561 100644 --- a/tests/genie/preparser-equality-expression.c-expected +++ b/tests/genie/preparser-equality-expression.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser-not.c-expected b/tests/genie/preparser-not.c-expected index 335b16cc6..9e23a8b4b 100644 --- a/tests/genie/preparser-not.c-expected +++ b/tests/genie/preparser-not.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser-or-expression.c-expected b/tests/genie/preparser-or-expression.c-expected index a82742926..7ef7787b7 100644 --- a/tests/genie/preparser-or-expression.c-expected +++ b/tests/genie/preparser-or-expression.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/preparser.c-expected b/tests/genie/preparser.c-expected index 04fcb5a6f..be71115fa 100644 --- a/tests/genie/preparser.c-expected +++ b/tests/genie/preparser.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/genie/print.c-expected b/tests/genie/print.c-expected index 3ecc7c6b6..769e13948 100644 --- a/tests/genie/print.c-expected +++ b/tests/genie/print.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (gchar** args, diff --git a/tests/genie/sizeof.c-expected b/tests/genie/sizeof.c-expected index 1502ba51c..27423b8e2 100644 --- a/tests/genie/sizeof.c-expected +++ b/tests/genie/sizeof.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/struct-after-class.c-expected b/tests/genie/struct-after-class.c-expected index 065906cda..32e69fa4b 100644 --- a/tests/genie/struct-after-class.c-expected +++ b/tests/genie/struct-after-class.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/struct.c-expected b/tests/genie/struct.c-expected index a3e4200b1..c90102683 100644 --- a/tests/genie/struct.c-expected +++ b/tests/genie/struct.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/try-except-finally.c-expected b/tests/genie/try-except-finally.c-expected index 690b77a23..468dcbe7f 100644 --- a/tests/genie/try-except-finally.c-expected +++ b/tests/genie/try-except-finally.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/typeof.c-expected b/tests/genie/typeof.c-expected index d4179b262..d1fdb28f6 100644 --- a/tests/genie/typeof.c-expected +++ b/tests/genie/typeof.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/genie/verbatim-template.c-expected b/tests/genie/verbatim-template.c-expected index 77d6bc879..f464c2845 100644 --- a/tests/genie/verbatim-template.c-expected +++ b/tests/genie/verbatim-template.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/genie/while.c-expected b/tests/genie/while.c-expected index 4398b69ea..f2396fe45 100644 --- a/tests/genie/while.c-expected +++ b/tests/genie/while.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (gchar** args, diff --git a/tests/headers/sealed-class.c-expected b/tests/headers/sealed-class.c-expected index 4118166e2..3e71426b9 100644 --- a/tests/headers/sealed-class.c-expected +++ b/tests/headers/sealed-class.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _Foo Foo; diff --git a/tests/linux/bug793444.c-expected b/tests/linux/bug793444.c-expected index 92294edef..6a6871670 100644 --- a/tests/linux/bug793444.c-expected +++ b/tests/linux/bug793444.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/linux/file-commandpipe.c-expected b/tests/linux/file-commandpipe.c-expected index 10c78a6f1..073c4ba2b 100644 --- a/tests/linux/file-commandpipe.c-expected +++ b/tests/linux/file-commandpipe.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _pclose0(var) ((var == NULL) ? NULL : (var = (pclose (var), NULL))) diff --git a/tests/methods/argument-array-initilizer.c-expected b/tests/methods/argument-array-initilizer.c-expected index 4cf430761..dc1e2ad01 100644 --- a/tests/methods/argument-array-initilizer.c-expected +++ b/tests/methods/argument-array-initilizer.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/argument-named.c-expected b/tests/methods/argument-named.c-expected index 392f99052..95a365b9f 100644 --- a/tests/methods/argument-named.c-expected +++ b/tests/methods/argument-named.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/array-length-type.c-expected b/tests/methods/array-length-type.c-expected index 36782ed3d..9db2f8dbc 100644 --- a/tests/methods/array-length-type.c-expected +++ b/tests/methods/array-length-type.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug540483.c-expected b/tests/methods/bug540483.c-expected index b9e2ae7f4..3288baea8 100644 --- a/tests/methods/bug540483.c-expected +++ b/tests/methods/bug540483.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug595538.c-expected b/tests/methods/bug595538.c-expected index 4eb4e9290..872c8ee34 100644 --- a/tests/methods/bug595538.c-expected +++ b/tests/methods/bug595538.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug596726.c-expected b/tests/methods/bug596726.c-expected index 553efc05d..d1a187ded 100644 --- a/tests/methods/bug596726.c-expected +++ b/tests/methods/bug596726.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug597426.c-expected b/tests/methods/bug597426.c-expected index 1d1b77364..ee5c442cb 100644 --- a/tests/methods/bug597426.c-expected +++ b/tests/methods/bug597426.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug598738.c-expected b/tests/methods/bug598738.c-expected index 94587f4fa..27eb5e938 100644 --- a/tests/methods/bug598738.c-expected +++ b/tests/methods/bug598738.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef void (*Func) (gpointer user_data); diff --git a/tests/methods/bug599892.c-expected b/tests/methods/bug599892.c-expected index ccff9c1c5..fb725c1fa 100644 --- a/tests/methods/bug599892.c-expected +++ b/tests/methods/bug599892.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug613483.c-expected b/tests/methods/bug613483.c-expected index eff0cbfb4..fd2d9258f 100644 --- a/tests/methods/bug613483.c-expected +++ b/tests/methods/bug613483.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug620673.c-expected b/tests/methods/bug620673.c-expected index cc61c928f..cd8c7f01d 100644 --- a/tests/methods/bug620673.c-expected +++ b/tests/methods/bug620673.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug622570.c-expected b/tests/methods/bug622570.c-expected index 24438cd5d..332e2ce24 100644 --- a/tests/methods/bug622570.c-expected +++ b/tests/methods/bug622570.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef gint (*Deleg1) (gint* foo, gpointer user_data); diff --git a/tests/methods/bug626783.c-expected b/tests/methods/bug626783.c-expected index cddf65d5d..4eeffbf5b 100644 --- a/tests/methods/bug626783.c-expected +++ b/tests/methods/bug626783.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug634753.c-expected b/tests/methods/bug634753.c-expected index cf151309a..e0c3ea798 100644 --- a/tests/methods/bug634753.c-expected +++ b/tests/methods/bug634753.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug639054.c-expected b/tests/methods/bug639054.c-expected index a093ac027..8c6edb825 100644 --- a/tests/methods/bug639054.c-expected +++ b/tests/methods/bug639054.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug642350.c-expected b/tests/methods/bug642350.c-expected index f26b1ad56..d8c6b7077 100644 --- a/tests/methods/bug642350.c-expected +++ b/tests/methods/bug642350.c-expected @@ -9,9 +9,8 @@ #define BAZ N_ ("bar") #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug642885.c-expected b/tests/methods/bug642885.c-expected index f9ea8b84d..b1615259f 100644 --- a/tests/methods/bug642885.c-expected +++ b/tests/methods/bug642885.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug642899.c-expected b/tests/methods/bug642899.c-expected index 1176d3c40..19ff7a403 100644 --- a/tests/methods/bug642899.c-expected +++ b/tests/methods/bug642899.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug646345.c-expected b/tests/methods/bug646345.c-expected index 5980b15c1..b4943af25 100644 --- a/tests/methods/bug646345.c-expected +++ b/tests/methods/bug646345.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _Block1Data Block1Data; diff --git a/tests/methods/bug648320.c-expected b/tests/methods/bug648320.c-expected index 00bb226cd..b7205a536 100644 --- a/tests/methods/bug648320.c-expected +++ b/tests/methods/bug648320.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug649562.c-expected b/tests/methods/bug649562.c-expected index 7d87d7c75..b758345d9 100644 --- a/tests/methods/bug649562.c-expected +++ b/tests/methods/bug649562.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/methods/bug652098.c-expected b/tests/methods/bug652098.c-expected index 6aca76e5e..67c1f9ec0 100644 --- a/tests/methods/bug652098.c-expected +++ b/tests/methods/bug652098.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug653391.c-expected b/tests/methods/bug653391.c-expected index 04387d849..ebd7127d0 100644 --- a/tests/methods/bug653391.c-expected +++ b/tests/methods/bug653391.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug653908.c-expected b/tests/methods/bug653908.c-expected index 92200b6e2..dff5e715c 100644 --- a/tests/methods/bug653908.c-expected +++ b/tests/methods/bug653908.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug663210.c-expected b/tests/methods/bug663210.c-expected index c5b3cf87c..98c63d5b5 100644 --- a/tests/methods/bug663210.c-expected +++ b/tests/methods/bug663210.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug699956.c-expected b/tests/methods/bug699956.c-expected index 4c41e65df..a0a78a1f7 100644 --- a/tests/methods/bug699956.c-expected +++ b/tests/methods/bug699956.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug710862.c-expected b/tests/methods/bug710862.c-expected index 29ae62f4a..791104686 100644 --- a/tests/methods/bug710862.c-expected +++ b/tests/methods/bug710862.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug723009.c-expected b/tests/methods/bug723009.c-expected index 6e74da632..65eb4391a 100644 --- a/tests/methods/bug723009.c-expected +++ b/tests/methods/bug723009.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug723195.c-expected b/tests/methods/bug723195.c-expected index 92310b14b..98bda3cd2 100644 --- a/tests/methods/bug723195.c-expected +++ b/tests/methods/bug723195.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/methods/bug726347.c-expected b/tests/methods/bug726347.c-expected index 98182b0ee..add619c36 100644 --- a/tests/methods/bug726347.c-expected +++ b/tests/methods/bug726347.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug736235.c-expected b/tests/methods/bug736235.c-expected index 7059c1427..80b94b584 100644 --- a/tests/methods/bug736235.c-expected +++ b/tests/methods/bug736235.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug737222.c-expected b/tests/methods/bug737222.c-expected index e1d2f7988..48874040c 100644 --- a/tests/methods/bug737222.c-expected +++ b/tests/methods/bug737222.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug743877.c-expected b/tests/methods/bug743877.c-expected index d519740ec..66bfdaeda 100644 --- a/tests/methods/bug743877.c-expected +++ b/tests/methods/bug743877.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/methods/bug771964.c-expected b/tests/methods/bug771964.c-expected index 2297edb07..5773bda3a 100644 --- a/tests/methods/bug771964.c-expected +++ b/tests/methods/bug771964.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug774060.c-expected b/tests/methods/bug774060.c-expected index 3c9cbd8f8..39c3885bd 100644 --- a/tests/methods/bug774060.c-expected +++ b/tests/methods/bug774060.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug781061.c-expected b/tests/methods/bug781061.c-expected index e694c6f91..256ff63b4 100644 --- a/tests/methods/bug781061.c-expected +++ b/tests/methods/bug781061.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug784691.c-expected b/tests/methods/bug784691.c-expected index eb6bdf5c4..9bbe1069f 100644 --- a/tests/methods/bug784691.c-expected +++ b/tests/methods/bug784691.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug791215.c-expected b/tests/methods/bug791215.c-expected index 0166a50ef..5b4ab08e8 100644 --- a/tests/methods/bug791215.c-expected +++ b/tests/methods/bug791215.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/bug791283.c-expected b/tests/methods/bug791283.c-expected index e8966c8d3..42c0322ae 100644 --- a/tests/methods/bug791283.c-expected +++ b/tests/methods/bug791283.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/closures.c-expected b/tests/methods/closures.c-expected index e15158784..233114c61 100644 --- a/tests/methods/closures.c-expected +++ b/tests/methods/closures.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/contains.c-expected b/tests/methods/contains.c-expected index e22f7edee..a0c9b3a4d 100644 --- a/tests/methods/contains.c-expected +++ b/tests/methods/contains.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/delegate-target.c-expected b/tests/methods/delegate-target.c-expected index 631e33c4b..d09580c22 100644 --- a/tests/methods/delegate-target.c-expected +++ b/tests/methods/delegate-target.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/extern.c-expected b/tests/methods/extern.c-expected index e28962e6c..d5b3469bc 100644 --- a/tests/methods/extern.c-expected +++ b/tests/methods/extern.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/generics.c-expected b/tests/methods/generics.c-expected index cb463b870..3128e794a 100644 --- a/tests/methods/generics.c-expected +++ b/tests/methods/generics.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/iterator.c-expected b/tests/methods/iterator.c-expected index a019584f5..65ca5db1e 100644 --- a/tests/methods/iterator.c-expected +++ b/tests/methods/iterator.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/lambda.c-expected b/tests/methods/lambda.c-expected index e2698a7c7..9da787692 100644 --- a/tests/methods/lambda.c-expected +++ b/tests/methods/lambda.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/local-functions.c-expected b/tests/methods/local-functions.c-expected index 3b2cdc3a2..297581b71 100644 --- a/tests/methods/local-functions.c-expected +++ b/tests/methods/local-functions.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef gint (*_LocalFunc0_) (gpointer user_data); diff --git a/tests/methods/nowrapper-interface.c-expected b/tests/methods/nowrapper-interface.c-expected index aa7fb8fde..29eb3bfd5 100644 --- a/tests/methods/nowrapper-interface.c-expected +++ b/tests/methods/nowrapper-interface.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-ccode-type.c-expected b/tests/methods/parameter-ccode-type.c-expected index cf761ad1b..672f445ad 100644 --- a/tests/methods/parameter-ccode-type.c-expected +++ b/tests/methods/parameter-ccode-type.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-fixed-array-initializer.c-expected b/tests/methods/parameter-fixed-array-initializer.c-expected index ec56bf788..1d1448565 100644 --- a/tests/methods/parameter-fixed-array-initializer.c-expected +++ b/tests/methods/parameter-fixed-array-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-out-free-on-error.c-expected b/tests/methods/parameter-out-free-on-error.c-expected index 2e98e641c..649e8a958 100644 --- a/tests/methods/parameter-out-free-on-error.c-expected +++ b/tests/methods/parameter-out-free-on-error.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-ref-array-resize-captured.c-expected b/tests/methods/parameter-ref-array-resize-captured.c-expected index 8de6d6fa7..c6cd9698b 100644 --- a/tests/methods/parameter-ref-array-resize-captured.c-expected +++ b/tests/methods/parameter-ref-array-resize-captured.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-ref-array-resize.c-expected b/tests/methods/parameter-ref-array-resize.c-expected index 0941da7c4..02a5fd594 100644 --- a/tests/methods/parameter-ref-array-resize.c-expected +++ b/tests/methods/parameter-ref-array-resize.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-ref-delegate.c-expected b/tests/methods/parameter-ref-delegate.c-expected index c3e8b24d9..439c7c5ed 100644 --- a/tests/methods/parameter-ref-delegate.c-expected +++ b/tests/methods/parameter-ref-delegate.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/parameter-ref-element-access.c-expected b/tests/methods/parameter-ref-element-access.c-expected index 7506dee22..34b262205 100644 --- a/tests/methods/parameter-ref-element-access.c-expected +++ b/tests/methods/parameter-ref-element-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/params-array-with-throws.c-expected b/tests/methods/params-array-with-throws.c-expected index ea6d4b616..7dbbb5e06 100644 --- a/tests/methods/params-array-with-throws.c-expected +++ b/tests/methods/params-array-with-throws.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/params-array.c-expected b/tests/methods/params-array.c-expected index 4961b37f6..58e567361 100644 --- a/tests/methods/params-array.c-expected +++ b/tests/methods/params-array.c-expected @@ -10,9 +10,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/postconditions-temp-variables.c-expected b/tests/methods/postconditions-temp-variables.c-expected index 066cc9a36..ee8c16164 100644 --- a/tests/methods/postconditions-temp-variables.c-expected +++ b/tests/methods/postconditions-temp-variables.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/postconditions.c-expected b/tests/methods/postconditions.c-expected index 238d6e8c3..ee7131325 100644 --- a/tests/methods/postconditions.c-expected +++ b/tests/methods/postconditions.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/preconditions-temp-variables.c-expected b/tests/methods/preconditions-temp-variables.c-expected index c09064948..911e10b9f 100644 --- a/tests/methods/preconditions-temp-variables.c-expected +++ b/tests/methods/preconditions-temp-variables.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/prepostconditions-captured.c-expected b/tests/methods/prepostconditions-captured.c-expected index bc2030601..b9216d23a 100644 --- a/tests/methods/prepostconditions-captured.c-expected +++ b/tests/methods/prepostconditions-captured.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/prepostconditions-contains.c-expected b/tests/methods/prepostconditions-contains.c-expected index e02083483..10b29bf8a 100644 --- a/tests/methods/prepostconditions-contains.c-expected +++ b/tests/methods/prepostconditions-contains.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/prepostconditions.c-expected b/tests/methods/prepostconditions.c-expected index 60e81c1ea..55c0cc33e 100644 --- a/tests/methods/prepostconditions.c-expected +++ b/tests/methods/prepostconditions.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/print-attribute.c-expected b/tests/methods/print-attribute.c-expected index f76d8271c..7aa8cd6d0 100644 --- a/tests/methods/print-attribute.c-expected +++ b/tests/methods/print-attribute.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/printf-constructor.c-expected b/tests/methods/printf-constructor.c-expected index e9a891a88..db0256128 100644 --- a/tests/methods/printf-constructor.c-expected +++ b/tests/methods/printf-constructor.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) diff --git a/tests/methods/profile.c-expected b/tests/methods/profile.c-expected index 6a9065032..cf01ceb1f 100644 --- a/tests/methods/profile.c-expected +++ b/tests/methods/profile.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/return-unowned-delegate.c-expected b/tests/methods/return-unowned-delegate.c-expected index 879096b06..211989789 100644 --- a/tests/methods/return-unowned-delegate.c-expected +++ b/tests/methods/return-unowned-delegate.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/same-name.c-expected b/tests/methods/same-name.c-expected index e53792fd3..d78bf408d 100644 --- a/tests/methods/same-name.c-expected +++ b/tests/methods/same-name.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/symbolresolution.c-expected b/tests/methods/symbolresolution.c-expected index 09232d477..fd742677c 100644 --- a/tests/methods/symbolresolution.c-expected +++ b/tests/methods/symbolresolution.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-delegate-without-target.c-expected b/tests/methods/varargs-delegate-without-target.c-expected index a7d29c9a0..79fdb9620 100644 --- a/tests/methods/varargs-delegate-without-target.c-expected +++ b/tests/methods/varargs-delegate-without-target.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-delegate.c-expected b/tests/methods/varargs-delegate.c-expected index d7ec57960..5434c0226 100644 --- a/tests/methods/varargs-delegate.c-expected +++ b/tests/methods/varargs-delegate.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-gvalue.c-expected b/tests/methods/varargs-gvalue.c-expected index 481e60084..e10738626 100644 --- a/tests/methods/varargs-gvalue.c-expected +++ b/tests/methods/varargs-gvalue.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-out.c-expected b/tests/methods/varargs-out.c-expected index 86e3941a0..5f43cec1a 100644 --- a/tests/methods/varargs-out.c-expected +++ b/tests/methods/varargs-out.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-ref.c-expected b/tests/methods/varargs-ref.c-expected index cc2016612..f1f7938b4 100644 --- a/tests/methods/varargs-ref.c-expected +++ b/tests/methods/varargs-ref.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/methods/varargs-struct.c-expected b/tests/methods/varargs-struct.c-expected index 05b86895f..68ef15f3e 100644 --- a/tests/methods/varargs-struct.c-expected +++ b/tests/methods/varargs-struct.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/namespace/unique.c-expected b/tests/namespace/unique.c-expected index f3d7aa231..2e17906b7 100644 --- a/tests/namespace/unique.c-expected +++ b/tests/namespace/unique.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/nullability/array-element-class.c-expected b/tests/nullability/array-element-class.c-expected index d6235c2eb..6a37eb489 100644 --- a/tests/nullability/array-element-class.c-expected +++ b/tests/nullability/array-element-class.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/nullability/array-element-string.c-expected b/tests/nullability/array-element-string.c-expected index abd408596..6530e3fb3 100644 --- a/tests/nullability/array-element-string.c-expected +++ b/tests/nullability/array-element-string.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/nullability/bug611223.c-expected b/tests/nullability/bug611223.c-expected index 9601c75e5..67febbabd 100644 --- a/tests/nullability/bug611223.c-expected +++ b/tests/nullability/bug611223.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/nullability/generics.c-expected b/tests/nullability/generics.c-expected index 6091d9509..400f57360 100644 --- a/tests/nullability/generics.c-expected +++ b/tests/nullability/generics.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/nullability/member-access-narrowed-instance.c-expected b/tests/nullability/member-access-narrowed-instance.c-expected index 47cf3c44d..15bbda686 100644 --- a/tests/nullability/member-access-narrowed-instance.c-expected +++ b/tests/nullability/member-access-narrowed-instance.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/nullability/var-type.c-expected b/tests/nullability/var-type.c-expected index 7458724c1..2c7820e75 100644 --- a/tests/nullability/var-type.c-expected +++ b/tests/nullability/var-type.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/objects/bug566909.c-expected b/tests/objects/bug566909.c-expected index 3e46ba747..0ecffa6db 100644 --- a/tests/objects/bug566909.c-expected +++ b/tests/objects/bug566909.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug588203.c-expected b/tests/objects/bug588203.c-expected index cfb1ac415..7889c0e4c 100644 --- a/tests/objects/bug588203.c-expected +++ b/tests/objects/bug588203.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug589928.c-expected b/tests/objects/bug589928.c-expected index b85fd787c..7d24e22c2 100644 --- a/tests/objects/bug589928.c-expected +++ b/tests/objects/bug589928.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug593137.c-expected b/tests/objects/bug593137.c-expected index 0b4bbcb93..72b967c33 100644 --- a/tests/objects/bug593137.c-expected +++ b/tests/objects/bug593137.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug593260.c-expected b/tests/objects/bug593260.c-expected index a14498121..69337abef 100644 --- a/tests/objects/bug593260.c-expected +++ b/tests/objects/bug593260.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug596621.c-expected b/tests/objects/bug596621.c-expected index f37ff6e58..7aa93f3fd 100644 --- a/tests/objects/bug596621.c-expected +++ b/tests/objects/bug596621.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug597155.c-expected b/tests/objects/bug597155.c-expected index 426404096..1a8aa1743 100644 --- a/tests/objects/bug597155.c-expected +++ b/tests/objects/bug597155.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug597161.c-expected b/tests/objects/bug597161.c-expected index 11d325f07..dc4a4b88b 100644 --- a/tests/objects/bug597161.c-expected +++ b/tests/objects/bug597161.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug613486.c-expected b/tests/objects/bug613486.c-expected index eaa70ce7c..b2eae74e1 100644 --- a/tests/objects/bug613486.c-expected +++ b/tests/objects/bug613486.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug613840.c-expected b/tests/objects/bug613840.c-expected index 729403d17..4f9cd0284 100644 --- a/tests/objects/bug613840.c-expected +++ b/tests/objects/bug613840.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/objects/bug620675.c-expected b/tests/objects/bug620675.c-expected index 515218e63..a22616f89 100644 --- a/tests/objects/bug620675.c-expected +++ b/tests/objects/bug620675.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug620706.c-expected b/tests/objects/bug620706.c-expected index 3b2eba7ea..8aef1b14a 100644 --- a/tests/objects/bug620706.c-expected +++ b/tests/objects/bug620706.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug624594.c-expected b/tests/objects/bug624594.c-expected index 33d097a26..d267d5b23 100644 --- a/tests/objects/bug624594.c-expected +++ b/tests/objects/bug624594.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug626038-2.c-expected b/tests/objects/bug626038-2.c-expected index 8f84e8d5f..66c9344e9 100644 --- a/tests/objects/bug626038-2.c-expected +++ b/tests/objects/bug626038-2.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug626038.c-expected b/tests/objects/bug626038.c-expected index f91ae3118..d3c59d503 100644 --- a/tests/objects/bug626038.c-expected +++ b/tests/objects/bug626038.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug628639.c-expected b/tests/objects/bug628639.c-expected index 64644b59e..c2a445b06 100644 --- a/tests/objects/bug628639.c-expected +++ b/tests/objects/bug628639.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug629593.c-expected b/tests/objects/bug629593.c-expected index ccd629b79..e6d0caece 100644 --- a/tests/objects/bug629593.c-expected +++ b/tests/objects/bug629593.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug631267.c-expected b/tests/objects/bug631267.c-expected index 1b66f5666..8dc9413b1 100644 --- a/tests/objects/bug631267.c-expected +++ b/tests/objects/bug631267.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug634782.c-expected b/tests/objects/bug634782.c-expected index 05fa42a6f..f66f497c8 100644 --- a/tests/objects/bug634782.c-expected +++ b/tests/objects/bug634782.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug641828.c-expected b/tests/objects/bug641828.c-expected index ca8fa265e..cf58f77a0 100644 --- a/tests/objects/bug641828.c-expected +++ b/tests/objects/bug641828.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug642809.c-expected b/tests/objects/bug642809.c-expected index 75997b17c..4ec55f90c 100644 --- a/tests/objects/bug642809.c-expected +++ b/tests/objects/bug642809.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug643711.c-expected b/tests/objects/bug643711.c-expected index 55ad271eb..65a99a891 100644 --- a/tests/objects/bug643711.c-expected +++ b/tests/objects/bug643711.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug644938.c-expected b/tests/objects/bug644938.c-expected index 34295d655..43ac70ccb 100644 --- a/tests/objects/bug644938.c-expected +++ b/tests/objects/bug644938.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug646362.c-expected b/tests/objects/bug646362.c-expected index 9f1d6f280..14c4e83b3 100644 --- a/tests/objects/bug646362.c-expected +++ b/tests/objects/bug646362.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug646792.c-expected b/tests/objects/bug646792.c-expected index e18468679..c199ed0c8 100644 --- a/tests/objects/bug646792.c-expected +++ b/tests/objects/bug646792.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug647018.c-expected b/tests/objects/bug647018.c-expected index f55251f85..707679899 100644 --- a/tests/objects/bug647018.c-expected +++ b/tests/objects/bug647018.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug653138.c-expected b/tests/objects/bug653138.c-expected index 443abbb2e..2fcf9764b 100644 --- a/tests/objects/bug653138.c-expected +++ b/tests/objects/bug653138.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug654702.c-expected b/tests/objects/bug654702.c-expected index 8f6d450b2..b626dd8cf 100644 --- a/tests/objects/bug654702.c-expected +++ b/tests/objects/bug654702.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug663134.c-expected b/tests/objects/bug663134.c-expected index 85901e743..fc12dfcc9 100644 --- a/tests/objects/bug663134.c-expected +++ b/tests/objects/bug663134.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug664529.c-expected b/tests/objects/bug664529.c-expected index 68ead16e7..6b91dee13 100644 --- a/tests/objects/bug664529.c-expected +++ b/tests/objects/bug664529.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) diff --git a/tests/objects/bug681356.c-expected b/tests/objects/bug681356.c-expected index 2b1343095..a5de1dae1 100644 --- a/tests/objects/bug681356.c-expected +++ b/tests/objects/bug681356.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug683646.c-expected b/tests/objects/bug683646.c-expected index 6b57db212..a89f25da3 100644 --- a/tests/objects/bug683646.c-expected +++ b/tests/objects/bug683646.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug695671.c-expected b/tests/objects/bug695671.c-expected index 0c6774e68..1049e156e 100644 --- a/tests/objects/bug695671.c-expected +++ b/tests/objects/bug695671.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug702736.c-expected b/tests/objects/bug702736.c-expected index b4062bde7..bbad2f065 100644 --- a/tests/objects/bug702736.c-expected +++ b/tests/objects/bug702736.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug702846.c-expected b/tests/objects/bug702846.c-expected index 40669bd8d..0bdc977af 100644 --- a/tests/objects/bug702846.c-expected +++ b/tests/objects/bug702846.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/objects/bug731547.c-expected b/tests/objects/bug731547.c-expected index 8580df3d7..9a49e71cd 100644 --- a/tests/objects/bug731547.c-expected +++ b/tests/objects/bug731547.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug741465.c-expected b/tests/objects/bug741465.c-expected index 9d31a4988..9fbfccd1f 100644 --- a/tests/objects/bug741465.c-expected +++ b/tests/objects/bug741465.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug751338.c-expected b/tests/objects/bug751338.c-expected index b3b93ff6b..7409ca7ad 100644 --- a/tests/objects/bug751338.c-expected +++ b/tests/objects/bug751338.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug758816.c-expected b/tests/objects/bug758816.c-expected index 246c6e9d1..7ca659526 100644 --- a/tests/objects/bug758816.c-expected +++ b/tests/objects/bug758816.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug764481.c-expected b/tests/objects/bug764481.c-expected index 9e3b785cd..d0e3a59d1 100644 --- a/tests/objects/bug764481.c-expected +++ b/tests/objects/bug764481.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug766739.c-expected b/tests/objects/bug766739.c-expected index 08dd9d798..61f9dee0c 100644 --- a/tests/objects/bug766739.c-expected +++ b/tests/objects/bug766739.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug778632.c-expected b/tests/objects/bug778632.c-expected index 3b722f8ec..75950cc4b 100644 --- a/tests/objects/bug778632.c-expected +++ b/tests/objects/bug778632.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug779219.c-expected b/tests/objects/bug779219.c-expected index 1287be8f3..d9a3b747e 100644 --- a/tests/objects/bug779219.c-expected +++ b/tests/objects/bug779219.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug779955.c-expected b/tests/objects/bug779955.c-expected index a035b43d2..87c962b99 100644 --- a/tests/objects/bug779955.c-expected +++ b/tests/objects/bug779955.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug783897.c-expected b/tests/objects/bug783897.c-expected index 470d005b5..64dacb3af 100644 --- a/tests/objects/bug783897.c-expected +++ b/tests/objects/bug783897.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug788964.c-expected b/tests/objects/bug788964.c-expected index f6f43caa6..075e1dbbb 100644 --- a/tests/objects/bug788964.c-expected +++ b/tests/objects/bug788964.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/bug795521.c-expected b/tests/objects/bug795521.c-expected index c1ab14f85..bee6d532e 100644 --- a/tests/objects/bug795521.c-expected +++ b/tests/objects/bug795521.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/chainup.c-expected b/tests/objects/chainup.c-expected index c265eadb4..05447dcd9 100644 --- a/tests/objects/chainup.c-expected +++ b/tests/objects/chainup.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-ccode-cprefix.c-expected b/tests/objects/class-ccode-cprefix.c-expected index bd00666eb..aa023f397 100644 --- a/tests/objects/class-ccode-cprefix.c-expected +++ b/tests/objects/class-ccode-cprefix.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-destroysinstance.c-expected b/tests/objects/class-destroysinstance.c-expected index 6176ce786..f73e5c577 100644 --- a/tests/objects/class-destroysinstance.c-expected +++ b/tests/objects/class-destroysinstance.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-inner-types.c-expected b/tests/objects/class-inner-types.c-expected index b83dcb304..84e55f1fd 100644 --- a/tests/objects/class-inner-types.c-expected +++ b/tests/objects/class-inner-types.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-new-no-override.c-expected b/tests/objects/class-new-no-override.c-expected index 1fc3b291c..5e4fbf656 100644 --- a/tests/objects/class-new-no-override.c-expected +++ b/tests/objects/class-new-no-override.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-partial-nested.c-expected b/tests/objects/class-partial-nested.c-expected index 7d10b5d23..157460f11 100644 --- a/tests/objects/class-partial-nested.c-expected +++ b/tests/objects/class-partial-nested.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-partial.c-expected b/tests/objects/class-partial.c-expected index 9e103b668..fff76f9c9 100644 --- a/tests/objects/class-partial.c-expected +++ b/tests/objects/class-partial.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-ref-void.c-expected b/tests/objects/class-ref-void.c-expected index 61552cb18..7cc95eada 100644 --- a/tests/objects/class-ref-void.c-expected +++ b/tests/objects/class-ref-void.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class-vfunc-base-access.c-expected b/tests/objects/class-vfunc-base-access.c-expected index 193f189f5..55e2e597b 100644 --- a/tests/objects/class-vfunc-base-access.c-expected +++ b/tests/objects/class-vfunc-base-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/class_only.c-expected b/tests/objects/class_only.c-expected index 5d55158ae..b6c64e2b8 100644 --- a/tests/objects/class_only.c-expected +++ b/tests/objects/class_only.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/classes-implicit-implementation.c-expected b/tests/objects/classes-implicit-implementation.c-expected index 2ab21b9b4..258fcb2cd 100644 --- a/tests/objects/classes-implicit-implementation.c-expected +++ b/tests/objects/classes-implicit-implementation.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/classes-interfaces-virtuals.c-expected b/tests/objects/classes-interfaces-virtuals.c-expected index 53a2603f7..1feca5a5c 100644 --- a/tests/objects/classes-interfaces-virtuals.c-expected +++ b/tests/objects/classes-interfaces-virtuals.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/classes-interfaces.c-expected b/tests/objects/classes-interfaces.c-expected index 057573971..5390e6294 100644 --- a/tests/objects/classes-interfaces.c-expected +++ b/tests/objects/classes-interfaces.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/classes.c-expected b/tests/objects/classes.c-expected index 6a137bbeb..dddfa8733 100644 --- a/tests/objects/classes.c-expected +++ b/tests/objects/classes.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/compact-class-custom-ref.c-expected b/tests/objects/compact-class-custom-ref.c-expected index 66528a57d..4ea1ae105 100644 --- a/tests/objects/compact-class-custom-ref.c-expected +++ b/tests/objects/compact-class-custom-ref.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/compact-class-destructor.c-expected b/tests/objects/compact-class-destructor.c-expected index 2a968fc70..d6070aebf 100644 --- a/tests/objects/compact-class-destructor.c-expected +++ b/tests/objects/compact-class-destructor.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/compact-class-refcount.c-expected b/tests/objects/compact-class-refcount.c-expected index d9b3b97b0..1c53aa693 100644 --- a/tests/objects/compact-class-refcount.c-expected +++ b/tests/objects/compact-class-refcount.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/compact-class.c-expected b/tests/objects/compact-class.c-expected index 41686c67e..48027ae38 100644 --- a/tests/objects/compact-class.c-expected +++ b/tests/objects/compact-class.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/constructor-inner-error.c-expected b/tests/objects/constructor-inner-error.c-expected index 1d39d0e6b..3d47c8b12 100644 --- a/tests/objects/constructor-inner-error.c-expected +++ b/tests/objects/constructor-inner-error.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/constructor-variadic.c-expected b/tests/objects/constructor-variadic.c-expected index 296315562..e86e4e20f 100644 --- a/tests/objects/constructor-variadic.c-expected +++ b/tests/objects/constructor-variadic.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/constructors.c-expected b/tests/objects/constructors.c-expected index 2d52c9f65..cb1327b9f 100644 --- a/tests/objects/constructors.c-expected +++ b/tests/objects/constructors.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/destructors.c-expected b/tests/objects/destructors.c-expected index 46da52c8a..3f8504a78 100644 --- a/tests/objects/destructors.c-expected +++ b/tests/objects/destructors.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/dynamic.c-expected b/tests/objects/dynamic.c-expected index 0fed1c20e..3c97d16ff 100644 --- a/tests/objects/dynamic.c-expected +++ b/tests/objects/dynamic.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/fields.c-expected b/tests/objects/fields.c-expected index b513b1bf4..c9a6eaaed 100644 --- a/tests/objects/fields.c-expected +++ b/tests/objects/fields.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/generics.c-expected b/tests/objects/generics.c-expected index f777bf1d0..9d4ea1298 100644 --- a/tests/objects/generics.c-expected +++ b/tests/objects/generics.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) diff --git a/tests/objects/gobject-class-lifetime.c-expected b/tests/objects/gobject-class-lifetime.c-expected index 7fb25c8ca..4e2f57331 100644 --- a/tests/objects/gobject-class-lifetime.c-expected +++ b/tests/objects/gobject-class-lifetime.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/gsource.c-expected b/tests/objects/gsource.c-expected index 46be67142..3f7a28165 100644 --- a/tests/objects/gsource.c-expected +++ b/tests/objects/gsource.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/gtype-class-lifetime.c-expected b/tests/objects/gtype-class-lifetime.c-expected index 3e6c54410..aab5a82a1 100644 --- a/tests/objects/gtype-class-lifetime.c-expected +++ b/tests/objects/gtype-class-lifetime.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/initially-unowned.c-expected b/tests/objects/initially-unowned.c-expected index e7a073e8a..2155b4de0 100644 --- a/tests/objects/initially-unowned.c-expected +++ b/tests/objects/initially-unowned.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/instance-comparison.c-expected b/tests/objects/instance-comparison.c-expected index 07e3c195e..4a696f74b 100644 --- a/tests/objects/instance-comparison.c-expected +++ b/tests/objects/instance-comparison.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-abstract-async-override.c-expected b/tests/objects/interface-abstract-async-override.c-expected index 592b2eab4..cf2e196b5 100644 --- a/tests/objects/interface-abstract-async-override.c-expected +++ b/tests/objects/interface-abstract-async-override.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-async-base-access.c-expected b/tests/objects/interface-async-base-access.c-expected index 82f561793..23a102f94 100644 --- a/tests/objects/interface-async-base-access.c-expected +++ b/tests/objects/interface-async-base-access.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-async-captured-generic.c-expected b/tests/objects/interface-async-captured-generic.c-expected index 97dd9db95..2a64e17b9 100644 --- a/tests/objects/interface-async-captured-generic.c-expected +++ b/tests/objects/interface-async-captured-generic.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-base-access.c-expected b/tests/objects/interface-base-access.c-expected index 7ff4707c5..69fd424f8 100644 --- a/tests/objects/interface-base-access.c-expected +++ b/tests/objects/interface-base-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-generics.c-expected b/tests/objects/interface-generics.c-expected index 7c1f98706..fd154706a 100644 --- a/tests/objects/interface-generics.c-expected +++ b/tests/objects/interface-generics.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-inner-types.c-expected b/tests/objects/interface-inner-types.c-expected index 47288a647..a4d649a0e 100644 --- a/tests/objects/interface-inner-types.c-expected +++ b/tests/objects/interface-inner-types.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-parameter-nowrapper.c-expected b/tests/objects/interface-parameter-nowrapper.c-expected index 53226e8f3..66a0770a0 100644 --- a/tests/objects/interface-parameter-nowrapper.c-expected +++ b/tests/objects/interface-parameter-nowrapper.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-property-base-access.c-expected b/tests/objects/interface-property-base-access.c-expected index e20e0d39a..87c7ca9d6 100644 --- a/tests/objects/interface-property-base-access.c-expected +++ b/tests/objects/interface-property-base-access.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-property-base-impl.c-expected b/tests/objects/interface-property-base-impl.c-expected index a8d7bd6a6..72f8834b9 100644 --- a/tests/objects/interface-property-base-impl.c-expected +++ b/tests/objects/interface-property-base-impl.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-property-delegate.c-expected b/tests/objects/interface-property-delegate.c-expected index 8f64b0a32..ef39a4ebb 100644 --- a/tests/objects/interface-property-delegate.c-expected +++ b/tests/objects/interface-property-delegate.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-property-override.c-expected b/tests/objects/interface-property-override.c-expected index 0f8f579b3..112b5cced 100644 --- a/tests/objects/interface-property-override.c-expected +++ b/tests/objects/interface-property-override.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface-virtual-override.c-expected b/tests/objects/interface-virtual-override.c-expected index cc88157af..187f3cb3e 100644 --- a/tests/objects/interface-virtual-override.c-expected +++ b/tests/objects/interface-virtual-override.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interface_only.c-expected b/tests/objects/interface_only.c-expected index f91310848..d133a96a1 100644 --- a/tests/objects/interface_only.c-expected +++ b/tests/objects/interface_only.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/interfaces.c-expected b/tests/objects/interfaces.c-expected index 50a3ba760..1b1a8fb78 100644 --- a/tests/objects/interfaces.c-expected +++ b/tests/objects/interfaces.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-base-properties.c-expected b/tests/objects/member-initializer-base-properties.c-expected index 7a27b51a1..1c9855ece 100644 --- a/tests/objects/member-initializer-base-properties.c-expected +++ b/tests/objects/member-initializer-base-properties.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-chained-2.c-expected b/tests/objects/member-initializer-chained-2.c-expected index 4a423ba62..cb712803b 100644 --- a/tests/objects/member-initializer-chained-2.c-expected +++ b/tests/objects/member-initializer-chained-2.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-chained.c-expected b/tests/objects/member-initializer-chained.c-expected index 878411522..8d821987f 100644 --- a/tests/objects/member-initializer-chained.c-expected +++ b/tests/objects/member-initializer-chained.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-private.c-expected b/tests/objects/member-initializer-private.c-expected index 275b65424..e2b8a552a 100644 --- a/tests/objects/member-initializer-private.c-expected +++ b/tests/objects/member-initializer-private.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-property-owned-setter.c-expected b/tests/objects/member-initializer-property-owned-setter.c-expected index f69ef8c7b..56b4ece5c 100644 --- a/tests/objects/member-initializer-property-owned-setter.c-expected +++ b/tests/objects/member-initializer-property-owned-setter.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-property.c-expected b/tests/objects/member-initializer-property.c-expected index ebce1770d..228f59b7d 100644 --- a/tests/objects/member-initializer-property.c-expected +++ b/tests/objects/member-initializer-property.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/member-initializer-protected.c-expected b/tests/objects/member-initializer-protected.c-expected index c1a07911f..711698124 100644 --- a/tests/objects/member-initializer-protected.c-expected +++ b/tests/objects/member-initializer-protected.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/methods.c-expected b/tests/objects/methods.c-expected index fa9454606..8207c9898 100644 --- a/tests/objects/methods.c-expected +++ b/tests/objects/methods.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/paramspec.c-expected b/tests/objects/paramspec.c-expected index f50c0ed8b..43b5e1412 100644 --- a/tests/objects/paramspec.c-expected +++ b/tests/objects/paramspec.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/plugin-module-init.c-expected b/tests/objects/plugin-module-init.c-expected index b22840b3c..6f1fc5c17 100644 --- a/tests/objects/plugin-module-init.c-expected +++ b/tests/objects/plugin-module-init.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/properties.c-expected b/tests/objects/properties.c-expected index a58e4486d..3a435771a 100644 --- a/tests/objects/properties.c-expected +++ b/tests/objects/properties.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-array-length.c-expected b/tests/objects/property-array-length.c-expected index 3d0688793..121aa2fa5 100644 --- a/tests/objects/property-array-length.c-expected +++ b/tests/objects/property-array-length.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-array.c-expected b/tests/objects/property-array.c-expected index e5a677a51..b3dfbd59e 100644 --- a/tests/objects/property-array.c-expected +++ b/tests/objects/property-array.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-base-access.c-expected b/tests/objects/property-base-access.c-expected index ea99765e4..6c14e7a30 100644 --- a/tests/objects/property-base-access.c-expected +++ b/tests/objects/property-base-access.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-construct-only.c-expected b/tests/objects/property-construct-only.c-expected index a8e6c6b55..04c531ae4 100644 --- a/tests/objects/property-construct-only.c-expected +++ b/tests/objects/property-construct-only.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-delegate-owned.c-expected b/tests/objects/property-delegate-owned.c-expected index ba4e90faa..f838ae88c 100644 --- a/tests/objects/property-delegate-owned.c-expected +++ b/tests/objects/property-delegate-owned.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-delegate.c-expected b/tests/objects/property-delegate.c-expected index 5a2f2002a..37cfc94a9 100644 --- a/tests/objects/property-delegate.c-expected +++ b/tests/objects/property-delegate.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-dynamic-type-inference.c-expected b/tests/objects/property-dynamic-type-inference.c-expected index 29d2a156d..3f49448e2 100644 --- a/tests/objects/property-dynamic-type-inference.c-expected +++ b/tests/objects/property-dynamic-type-inference.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-enum-nullable.c-expected b/tests/objects/property-enum-nullable.c-expected index 587af15b7..18f6f4d42 100644 --- a/tests/objects/property-enum-nullable.c-expected +++ b/tests/objects/property-enum-nullable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-enum.c-expected b/tests/objects/property-enum.c-expected index d406dfc19..d8976da2c 100644 --- a/tests/objects/property-enum.c-expected +++ b/tests/objects/property-enum.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-error.c-expected b/tests/objects/property-error.c-expected index e2b888c79..f8901fdd5 100644 --- a/tests/objects/property-error.c-expected +++ b/tests/objects/property-error.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-gboxed-nullable.c-expected b/tests/objects/property-gboxed-nullable.c-expected index ff8a339fc..f663e0532 100644 --- a/tests/objects/property-gboxed-nullable.c-expected +++ b/tests/objects/property-gboxed-nullable.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-notify-owned-getter.c-expected b/tests/objects/property-notify-owned-getter.c-expected index 94ae1ebc7..57f520005 100644 --- a/tests/objects/property-notify-owned-getter.c-expected +++ b/tests/objects/property-notify-owned-getter.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-notify.c-expected b/tests/objects/property-notify.c-expected index 18e654921..86ae39e8e 100644 --- a/tests/objects/property-notify.c-expected +++ b/tests/objects/property-notify.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-ownership.c-expected b/tests/objects/property-ownership.c-expected index f60d0737d..34257611b 100644 --- a/tests/objects/property-ownership.c-expected +++ b/tests/objects/property-ownership.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-read-only-auto.c-expected b/tests/objects/property-read-only-auto.c-expected index 43ca0a2c9..8536881b9 100644 --- a/tests/objects/property-read-only-auto.c-expected +++ b/tests/objects/property-read-only-auto.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-real-struct-assignment.c-expected b/tests/objects/property-real-struct-assignment.c-expected index 82c12b759..2c388de08 100644 --- a/tests/objects/property-real-struct-assignment.c-expected +++ b/tests/objects/property-real-struct-assignment.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-simple-type-struct-nullable.c-expected b/tests/objects/property-simple-type-struct-nullable.c-expected index e40fe56da..8c43b30f6 100644 --- a/tests/objects/property-simple-type-struct-nullable.c-expected +++ b/tests/objects/property-simple-type-struct-nullable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-static.c-expected b/tests/objects/property-static.c-expected index 7ae297a27..9c2fa3332 100644 --- a/tests/objects/property-static.c-expected +++ b/tests/objects/property-static.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-struct-no-gtype.c-expected b/tests/objects/property-struct-no-gtype.c-expected index f2f897948..25f7ea088 100644 --- a/tests/objects/property-struct-no-gtype.c-expected +++ b/tests/objects/property-struct-no-gtype.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-struct.c-expected b/tests/objects/property-struct.c-expected index 071900c68..9784e2acf 100644 --- a/tests/objects/property-struct.c-expected +++ b/tests/objects/property-struct.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/property-strv-noaccessor.c-expected b/tests/objects/property-strv-noaccessor.c-expected index aabfa3199..2f76cd301 100644 --- a/tests/objects/property-strv-noaccessor.c-expected +++ b/tests/objects/property-strv-noaccessor.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/regex.c-expected b/tests/objects/regex.c-expected index 97a53f32e..dc2a375e2 100644 --- a/tests/objects/regex.c-expected +++ b/tests/objects/regex.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-default-class-handler.c-expected b/tests/objects/signals-default-class-handler.c-expected index 4eed592d0..24231fe91 100644 --- a/tests/objects/signals-default-class-handler.c-expected +++ b/tests/objects/signals-default-class-handler.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-delegate-parameter.c-expected b/tests/objects/signals-delegate-parameter.c-expected index 2b68204a9..cb8ca37b1 100644 --- a/tests/objects/signals-delegate-parameter.c-expected +++ b/tests/objects/signals-delegate-parameter.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-delegate.c-expected b/tests/objects/signals-delegate.c-expected index c4fff484b..fc6edc3c2 100644 --- a/tests/objects/signals-delegate.c-expected +++ b/tests/objects/signals-delegate.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-dynamic-emit.c-expected b/tests/objects/signals-dynamic-emit.c-expected index 22491f896..434dd03f5 100644 --- a/tests/objects/signals-dynamic-emit.c-expected +++ b/tests/objects/signals-dynamic-emit.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-emit.c-expected b/tests/objects/signals-emit.c-expected index da1f30026..84694b024 100644 --- a/tests/objects/signals-emit.c-expected +++ b/tests/objects/signals-emit.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-enum-marshal.c-expected b/tests/objects/signals-enum-marshal.c-expected index 2eb489f14..f95bf2400 100644 --- a/tests/objects/signals-enum-marshal.c-expected +++ b/tests/objects/signals-enum-marshal.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-error-marshal.c-expected b/tests/objects/signals-error-marshal.c-expected index 64ee952a0..7aed17594 100644 --- a/tests/objects/signals-error-marshal.c-expected +++ b/tests/objects/signals-error-marshal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-fundamental-return.c-expected b/tests/objects/signals-fundamental-return.c-expected index e4feb2248..ce6ddf8a2 100644 --- a/tests/objects/signals-fundamental-return.c-expected +++ b/tests/objects/signals-fundamental-return.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-generic-return.c-expected b/tests/objects/signals-generic-return.c-expected index 7b27daae6..6673e7f7f 100644 --- a/tests/objects/signals-generic-return.c-expected +++ b/tests/objects/signals-generic-return.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-gobject-return.c-expected b/tests/objects/signals-gobject-return.c-expected index 99626a8a7..0b70da52d 100644 --- a/tests/objects/signals-gobject-return.c-expected +++ b/tests/objects/signals-gobject-return.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-lambda-delegate-2.c-expected b/tests/objects/signals-lambda-delegate-2.c-expected index ac444d51c..f453730d7 100644 --- a/tests/objects/signals-lambda-delegate-2.c-expected +++ b/tests/objects/signals-lambda-delegate-2.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-lambda-delegate.c-expected b/tests/objects/signals-lambda-delegate.c-expected index ee054e3ae..2f9205f9e 100644 --- a/tests/objects/signals-lambda-delegate.c-expected +++ b/tests/objects/signals-lambda-delegate.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-prototype-access.c-expected b/tests/objects/signals-prototype-access.c-expected index 8da198275..3ccc3eb4c 100644 --- a/tests/objects/signals-prototype-access.c-expected +++ b/tests/objects/signals-prototype-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-struct-return.c-expected b/tests/objects/signals-struct-return.c-expected index 8d1cbace2..376293dc7 100644 --- a/tests/objects/signals-struct-return.c-expected +++ b/tests/objects/signals-struct-return.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals-struct.c-expected b/tests/objects/signals-struct.c-expected index 1d74d2cb8..00ff33d0a 100644 --- a/tests/objects/signals-struct.c-expected +++ b/tests/objects/signals-struct.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/signals.c-expected b/tests/objects/signals.c-expected index be2c03a40..8e85aefd8 100644 --- a/tests/objects/signals.c-expected +++ b/tests/objects/signals.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/simple-generics-chainup.c-expected b/tests/objects/simple-generics-chainup.c-expected index aebdff0c7..77f58524c 100644 --- a/tests/objects/simple-generics-chainup.c-expected +++ b/tests/objects/simple-generics-chainup.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/singleton.c-expected b/tests/objects/singleton.c-expected index b7cff228e..9fb98d171 100644 --- a/tests/objects/singleton.c-expected +++ b/tests/objects/singleton.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/test-025.c-expected b/tests/objects/test-025.c-expected index 8554203fc..d5d429f09 100644 --- a/tests/objects/test-025.c-expected +++ b/tests/objects/test-025.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/test-026.c-expected b/tests/objects/test-026.c-expected index 51501310b..a2c8d73ab 100644 --- a/tests/objects/test-026.c-expected +++ b/tests/objects/test-026.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/test-029.c-expected b/tests/objects/test-029.c-expected index 71aac8dd0..1ca84167f 100644 --- a/tests/objects/test-029.c-expected +++ b/tests/objects/test-029.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/test-034.c-expected b/tests/objects/test-034.c-expected index b935341ce..358b39a15 100644 --- a/tests/objects/test-034.c-expected +++ b/tests/objects/test-034.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/type-narrowing-by-precondition.c-expected b/tests/objects/type-narrowing-by-precondition.c-expected index e45fc7e70..ff15295cc 100644 --- a/tests/objects/type-narrowing-by-precondition.c-expected +++ b/tests/objects/type-narrowing-by-precondition.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/type-narrowing-fallback.c-expected b/tests/objects/type-narrowing-fallback.c-expected index a767672a3..dbd3afae0 100644 --- a/tests/objects/type-narrowing-fallback.c-expected +++ b/tests/objects/type-narrowing-fallback.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/type-narrowing.c-expected b/tests/objects/type-narrowing.c-expected index 7cfb18038..129146aa9 100644 --- a/tests/objects/type-narrowing.c-expected +++ b/tests/objects/type-narrowing.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-expression.c-expected b/tests/objects/with-expression.c-expected index c12008d84..ac0d7b6c2 100644 --- a/tests/objects/with-expression.c-expected +++ b/tests/objects/with-expression.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-instance.c-expected b/tests/objects/with-instance.c-expected index 02c2eda42..7ba3b6263 100644 --- a/tests/objects/with-instance.c-expected +++ b/tests/objects/with-instance.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-nested-in-lambda.c-expected b/tests/objects/with-nested-in-lambda.c-expected index 9e6fc2035..0e87e2102 100644 --- a/tests/objects/with-nested-in-lambda.c-expected +++ b/tests/objects/with-nested-in-lambda.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-nested-method.c-expected b/tests/objects/with-nested-method.c-expected index ed5ededb8..df8f11c8a 100644 --- a/tests/objects/with-nested-method.c-expected +++ b/tests/objects/with-nested-method.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-nested-signal.c-expected b/tests/objects/with-nested-signal.c-expected index 000beabe4..42e2ff94b 100644 --- a/tests/objects/with-nested-signal.c-expected +++ b/tests/objects/with-nested-signal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-nested-unambigous-signal.c-expected b/tests/objects/with-nested-unambigous-signal.c-expected index 72d2d3a8f..6fff24619 100644 --- a/tests/objects/with-nested-unambigous-signal.c-expected +++ b/tests/objects/with-nested-unambigous-signal.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/objects/with-nested.c-expected b/tests/objects/with-nested.c-expected index 89cd50ca1..03bacccc1 100644 --- a/tests/objects/with-nested.c-expected +++ b/tests/objects/with-nested.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/constant-class.c-expected b/tests/ordering/constant-class.c-expected index 814ac93da..dea94e7f9 100644 --- a/tests/ordering/constant-class.c-expected +++ b/tests/ordering/constant-class.c-expected @@ -7,9 +7,8 @@ #define FOO 42 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/constant-constant.c-expected b/tests/ordering/constant-constant.c-expected index 3c8994637..d54c2ccf9 100644 --- a/tests/ordering/constant-constant.c-expected +++ b/tests/ordering/constant-constant.c-expected @@ -7,9 +7,8 @@ #define BAR FOO #define FOO_BAR (FOO + BAR) #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/ordering/constant-enum.c-expected b/tests/ordering/constant-enum.c-expected index 5aba59d8d..a629c4c97 100644 --- a/tests/ordering/constant-enum.c-expected +++ b/tests/ordering/constant-enum.c-expected @@ -6,9 +6,8 @@ #define FOO 42 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/constant-field.c-expected b/tests/ordering/constant-field.c-expected index fddd88b46..bfb145f2b 100644 --- a/tests/ordering/constant-field.c-expected +++ b/tests/ordering/constant-field.c-expected @@ -5,9 +5,8 @@ #define FOO 42 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/constant-struct.c-expected b/tests/ordering/constant-struct.c-expected index 1f2da376e..37da2cb56 100644 --- a/tests/ordering/constant-struct.c-expected +++ b/tests/ordering/constant-struct.c-expected @@ -7,9 +7,8 @@ #define FOO 42 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/delegate-class.c-expected b/tests/ordering/delegate-class.c-expected index e699642bb..2d7c1ab3c 100644 --- a/tests/ordering/delegate-class.c-expected +++ b/tests/ordering/delegate-class.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/delegate-enum.c-expected b/tests/ordering/delegate-enum.c-expected index 160a416ab..2187ca7a4 100644 --- a/tests/ordering/delegate-enum.c-expected +++ b/tests/ordering/delegate-enum.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/delegate-interface.c-expected b/tests/ordering/delegate-interface.c-expected index ece2b5c5b..b901021b9 100644 --- a/tests/ordering/delegate-interface.c-expected +++ b/tests/ordering/delegate-interface.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/delegate-struct.c-expected b/tests/ordering/delegate-struct.c-expected index 1ebdbbabe..729dee5ca 100644 --- a/tests/ordering/delegate-struct.c-expected +++ b/tests/ordering/delegate-struct.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/ordering/struct-delegate.c-expected b/tests/ordering/struct-delegate.c-expected index 3be86d399..2be259456 100644 --- a/tests/ordering/struct-delegate.c-expected +++ b/tests/ordering/struct-delegate.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser-keep-going/member-initializer.c-expected b/tests/parser-keep-going/member-initializer.c-expected index 09c865409..a7677c392 100644 --- a/tests/parser-keep-going/member-initializer.c-expected +++ b/tests/parser-keep-going/member-initializer.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/array-length.c-expected b/tests/parser/array-length.c-expected index 7a919d404..e22b65f9d 100644 --- a/tests/parser/array-length.c-expected +++ b/tests/parser/array-length.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/assignment.c-expected b/tests/parser/assignment.c-expected index 9870c83cf..bacbfe8c0 100644 --- a/tests/parser/assignment.c-expected +++ b/tests/parser/assignment.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/parser/bug728574.c-expected b/tests/parser/bug728574.c-expected index 0483089d7..97fc6cbca 100644 --- a/tests/parser/bug728574.c-expected +++ b/tests/parser/bug728574.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) diff --git a/tests/parser/bug749576.c-expected b/tests/parser/bug749576.c-expected index 39038fa51..101038009 100644 --- a/tests/parser/bug749576.c-expected +++ b/tests/parser/bug749576.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) diff --git a/tests/parser/chained-equality.c-expected b/tests/parser/chained-equality.c-expected index c7c15a826..3e649daad 100644 --- a/tests/parser/chained-equality.c-expected +++ b/tests/parser/chained-equality.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/parser/continue-statement.c-expected b/tests/parser/continue-statement.c-expected index a7bf64133..257c1f607 100644 --- a/tests/parser/continue-statement.c-expected +++ b/tests/parser/continue-statement.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/do-statement.c-expected b/tests/parser/do-statement.c-expected index a02719f21..301a56543 100644 --- a/tests/parser/do-statement.c-expected +++ b/tests/parser/do-statement.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/field-multi-one-line.c-expected b/tests/parser/field-multi-one-line.c-expected index f360b5822..6dfb99523 100644 --- a/tests/parser/field-multi-one-line.c-expected +++ b/tests/parser/field-multi-one-line.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/foreach.c-expected b/tests/parser/foreach.c-expected index 527252c6e..b37f14fdb 100644 --- a/tests/parser/foreach.c-expected +++ b/tests/parser/foreach.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/parser/local-variable-multi-one-line.c-expected b/tests/parser/local-variable-multi-one-line.c-expected index e1f070aaa..7498cb180 100644 --- a/tests/parser/local-variable-multi-one-line.c-expected +++ b/tests/parser/local-variable-multi-one-line.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/parser/local-variable.c-expected b/tests/parser/local-variable.c-expected index 7d2fd851b..1a77d85e9 100644 --- a/tests/parser/local-variable.c-expected +++ b/tests/parser/local-variable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/parser/lock-statement.c-expected b/tests/parser/lock-statement.c-expected index 2a7daa65b..885b53add 100644 --- a/tests/parser/lock-statement.c-expected +++ b/tests/parser/lock-statement.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/main-block-minimal.c-expected b/tests/parser/main-block-minimal.c-expected index 0063231f9..5330f4cc0 100644 --- a/tests/parser/main-block-minimal.c-expected +++ b/tests/parser/main-block-minimal.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/parser/main-block.c-expected b/tests/parser/main-block.c-expected index 5e5909dcf..cb6ed0bff 100644 --- a/tests/parser/main-block.c-expected +++ b/tests/parser/main-block.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/member-access-pointer.c-expected b/tests/parser/member-access-pointer.c-expected index 8e25a2599..9063f19a4 100644 --- a/tests/parser/member-access-pointer.c-expected +++ b/tests/parser/member-access-pointer.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/member-initializer-empty.c-expected b/tests/parser/member-initializer-empty.c-expected index 84962dcbe..75ed2a7fa 100644 --- a/tests/parser/member-initializer-empty.c-expected +++ b/tests/parser/member-initializer-empty.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/member-initializer-trailing-comma.c-expected b/tests/parser/member-initializer-trailing-comma.c-expected index 7925057fd..f5fb88834 100644 --- a/tests/parser/member-initializer-trailing-comma.c-expected +++ b/tests/parser/member-initializer-trailing-comma.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/member-initializer.c-expected b/tests/parser/member-initializer.c-expected index 11f615ce4..a677bac28 100644 --- a/tests/parser/member-initializer.c-expected +++ b/tests/parser/member-initializer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/namespaces.c-expected b/tests/parser/namespaces.c-expected index e82b8963c..3ccbe85dc 100644 --- a/tests/parser/namespaces.c-expected +++ b/tests/parser/namespaces.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/preprocessor-glib.c-expected b/tests/parser/preprocessor-glib.c-expected index 05cd382ec..2b72927b8 100644 --- a/tests/parser/preprocessor-glib.c-expected +++ b/tests/parser/preprocessor-glib.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/preprocessor-vala.c-expected b/tests/parser/preprocessor-vala.c-expected index 329ba88d8..73c827a6c 100644 --- a/tests/parser/preprocessor-vala.c-expected +++ b/tests/parser/preprocessor-vala.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/preprocessor.c-expected b/tests/parser/preprocessor.c-expected index d904423d7..ae5a5f0ea 100644 --- a/tests/parser/preprocessor.c-expected +++ b/tests/parser/preprocessor.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/qualified-member-access.c-expected b/tests/parser/qualified-member-access.c-expected index 89c3e8aab..bb58fd212 100644 --- a/tests/parser/qualified-member-access.c-expected +++ b/tests/parser/qualified-member-access.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/qualified-symbol-access.c-expected b/tests/parser/qualified-symbol-access.c-expected index 480901ead..abc53080c 100644 --- a/tests/parser/qualified-symbol-access.c-expected +++ b/tests/parser/qualified-symbol-access.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/sealed-class.c-expected b/tests/parser/sealed-class.c-expected index eed4d3bf5..7918bd442 100644 --- a/tests/parser/sealed-class.c-expected +++ b/tests/parser/sealed-class.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/statement-keyword-as-identifier.c-expected b/tests/parser/statement-keyword-as-identifier.c-expected index 6f2095684..013059259 100644 --- a/tests/parser/statement-keyword-as-identifier.c-expected +++ b/tests/parser/statement-keyword-as-identifier.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/switch-statement.c-expected b/tests/parser/switch-statement.c-expected index 172fee779..90055c5aa 100644 --- a/tests/parser/switch-statement.c-expected +++ b/tests/parser/switch-statement.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/template.c-expected b/tests/parser/template.c-expected index 3c4b52caa..8419f138a 100644 --- a/tests/parser/template.c-expected +++ b/tests/parser/template.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/tuple.c-expected b/tests/parser/tuple.c-expected index 56b87dba6..f9d9c9258 100644 --- a/tests/parser/tuple.c-expected +++ b/tests/parser/tuple.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/parser/using-directive.c-expected b/tests/parser/using-directive.c-expected index 3d0722dd2..c89d0e0bf 100644 --- a/tests/parser/using-directive.c-expected +++ b/tests/parser/using-directive.c-expected @@ -2,9 +2,8 @@ * generated from parser_using_directive.vala, do not modify */ #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -12,7 +11,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -20,9 +18,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -30,7 +28,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -45,6 +42,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/var-type-dynamic.c-expected b/tests/parser/var-type-dynamic.c-expected index 3e5f3b628..ea218f845 100644 --- a/tests/parser/var-type-dynamic.c-expected +++ b/tests/parser/var-type-dynamic.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/var-type-nullable.c-expected b/tests/parser/var-type-nullable.c-expected index da616b54f..a0665f497 100644 --- a/tests/parser/var-type-nullable.c-expected +++ b/tests/parser/var-type-nullable.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/parser/verbatim-template.c-expected b/tests/parser/verbatim-template.c-expected index 16e4cbbdf..ebcc63d03 100644 --- a/tests/parser/verbatim-template.c-expected +++ b/tests/parser/verbatim-template.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/parser/with-embedded.c-expected b/tests/parser/with-embedded.c-expected index 1bf8d0335..eb61286a7 100644 --- a/tests/parser/with-embedded.c-expected +++ b/tests/parser/with-embedded.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/parser/with-empty.c-expected b/tests/parser/with-empty.c-expected index e4ddd02f7..72df02aec 100644 --- a/tests/parser/with-empty.c-expected +++ b/tests/parser/with-empty.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/parser/yield-return.c-expected b/tests/parser/yield-return.c-expected index 1c62beeab..707b7bb3a 100644 --- a/tests/parser/yield-return.c-expected +++ b/tests/parser/yield-return.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/pointers/bug590641.c-expected b/tests/pointers/bug590641.c-expected index e264ae5f9..37e7019ca 100644 --- a/tests/pointers/bug590641.c-expected +++ b/tests/pointers/bug590641.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/pointers/delete.c-expected b/tests/pointers/delete.c-expected index e7ec9f4ce..b4bb866e0 100644 --- a/tests/pointers/delete.c-expected +++ b/tests/pointers/delete.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/posix/arrays.c-expected b/tests/posix/arrays.c-expected index fbe29b459..abc54f921 100644 --- a/tests/posix/arrays.c-expected +++ b/tests/posix/arrays.c-expected @@ -10,9 +10,8 @@ #define FOO 2 #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -20,7 +19,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -28,9 +26,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -38,7 +36,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -53,6 +50,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/posix/delegate_only.c-expected b/tests/posix/delegate_only.c-expected index 7003310f4..42b6d47ec 100644 --- a/tests/posix/delegate_only.c-expected +++ b/tests/posix/delegate_only.c-expected @@ -2,9 +2,8 @@ * generated from posix_delegate_only.vala, do not modify */ #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -12,7 +11,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -20,9 +18,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -30,7 +28,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -45,6 +42,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef void (*FooFunc) (void* user_data); diff --git a/tests/posix/empty-length-0.c-expected b/tests/posix/empty-length-0.c-expected index 6703e6ea4..c3dc00080 100644 --- a/tests/posix/empty-length-0.c-expected +++ b/tests/posix/empty-length-0.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/posix/enum-to-string.c-expected b/tests/posix/enum-to-string.c-expected index c5cea840b..6c4c53453 100644 --- a/tests/posix/enum-to-string.c-expected +++ b/tests/posix/enum-to-string.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/posix/enum_only.c-expected b/tests/posix/enum_only.c-expected index 77a686b5d..e840fc940 100644 --- a/tests/posix/enum_only.c-expected +++ b/tests/posix/enum_only.c-expected @@ -2,9 +2,8 @@ * generated from posix_enum_only.vala, do not modify */ #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -12,7 +11,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -20,9 +18,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -30,7 +28,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -45,6 +42,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef enum { diff --git a/tests/posix/string-concat.c-expected b/tests/posix/string-concat.c-expected index 1f4ee690c..aeb40ba2a 100644 --- a/tests/posix/string-concat.c-expected +++ b/tests/posix/string-concat.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/posix/string-printf.c-expected b/tests/posix/string-printf.c-expected index bcd08cd32..0fabd0a3f 100644 --- a/tests/posix/string-printf.c-expected +++ b/tests/posix/string-printf.c-expected @@ -9,9 +9,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -19,7 +18,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -27,9 +25,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -37,7 +35,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -52,6 +49,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _free0(var) ((var == NULL) ? NULL : (var = (free (var), NULL))) diff --git a/tests/posix/struct_only.c-expected b/tests/posix/struct_only.c-expected index 5243eb6fc..b11ca13e2 100644 --- a/tests/posix/struct_only.c-expected +++ b/tests/posix/struct_only.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/resolver/peek-inner-types.c-expected b/tests/resolver/peek-inner-types.c-expected index 565759273..4657b7df1 100644 --- a/tests/resolver/peek-inner-types.c-expected +++ b/tests/resolver/peek-inner-types.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/scanner/regex-escape-x.c-expected b/tests/scanner/regex-escape-x.c-expected index fd16e97eb..51154c6ba 100644 --- a/tests/scanner/regex-escape-x.c-expected +++ b/tests/scanner/regex-escape-x.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) diff --git a/tests/scanner/string-escape-x.c-expected b/tests/scanner/string-escape-x.c-expected index e3cf710a2..62d4cf1ab 100644 --- a/tests/scanner/string-escape-x.c-expected +++ b/tests/scanner/string-escape-x.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/scanner/string-template.c-expected b/tests/scanner/string-template.c-expected index db2001dc8..2bf96c8ac 100644 --- a/tests/scanner/string-template.c-expected +++ b/tests/scanner/string-template.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/scanner/string-verbatim-template.c-expected b/tests/scanner/string-verbatim-template.c-expected index 80160154c..e38b2c6c3 100644 --- a/tests/scanner/string-verbatim-template.c-expected +++ b/tests/scanner/string-verbatim-template.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/semantic/assignment-element-getter-setter.c-expected b/tests/semantic/assignment-element-getter-setter.c-expected index e8968f3ba..49dc9c4db 100644 --- a/tests/semantic/assignment-element-getter-setter.c-expected +++ b/tests/semantic/assignment-element-getter-setter.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/assignment-same-variable.c-expected b/tests/semantic/assignment-same-variable.c-expected index 9b3e88dad..d9f15fb88 100644 --- a/tests/semantic/assignment-same-variable.c-expected +++ b/tests/semantic/assignment-same-variable.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/class-opaque-automatic-property.c-expected b/tests/semantic/class-opaque-automatic-property.c-expected index 6df313c0d..1b6f42d93 100644 --- a/tests/semantic/class-opaque-automatic-property.c-expected +++ b/tests/semantic/class-opaque-automatic-property.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/class-opaque.c-expected b/tests/semantic/class-opaque.c-expected index 50b0c714d..85e8c38c6 100644 --- a/tests/semantic/class-opaque.c-expected +++ b/tests/semantic/class-opaque.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/compare-type-check.c-expected b/tests/semantic/compare-type-check.c-expected index aed7e6e8a..74d1e11e6 100644 --- a/tests/semantic/compare-type-check.c-expected +++ b/tests/semantic/compare-type-check.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/field-constant.c-expected b/tests/semantic/field-constant.c-expected index 227f12187..aa704a7a0 100644 --- a/tests/semantic/field-constant.c-expected +++ b/tests/semantic/field-constant.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/floating-reference-base-method.c-expected b/tests/semantic/floating-reference-base-method.c-expected index 37e0162e1..6151094e8 100644 --- a/tests/semantic/floating-reference-base-method.c-expected +++ b/tests/semantic/floating-reference-base-method.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/floating-reference-error.c-expected b/tests/semantic/floating-reference-error.c-expected index 953965f68..107400dd4 100644 --- a/tests/semantic/floating-reference-error.c-expected +++ b/tests/semantic/floating-reference-error.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/floating-reference.c-expected b/tests/semantic/floating-reference.c-expected index eb85adbab..414c58c9f 100644 --- a/tests/semantic/floating-reference.c-expected +++ b/tests/semantic/floating-reference.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/localvariable-var-pointer-initializer.c-expected b/tests/semantic/localvariable-var-pointer-initializer.c-expected index 6c2fac8c7..74aba64d9 100644 --- a/tests/semantic/localvariable-var-pointer-initializer.c-expected +++ b/tests/semantic/localvariable-var-pointer-initializer.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/member-access-static-transformed-qualified.c-expected b/tests/semantic/member-access-static-transformed-qualified.c-expected index 5f795a214..c8ca32e1c 100644 --- a/tests/semantic/member-access-static-transformed-qualified.c-expected +++ b/tests/semantic/member-access-static-transformed-qualified.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/member-access-static-with-instance.c-expected b/tests/semantic/member-access-static-with-instance.c-expected index a76af83b9..77474d6b0 100644 --- a/tests/semantic/member-access-static-with-instance.c-expected +++ b/tests/semantic/member-access-static-with-instance.c-expected @@ -8,9 +8,8 @@ #define FOO_FOO 23 #define BAR FOO_FOO #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/member-access-transformed-qualified.c-expected b/tests/semantic/member-access-transformed-qualified.c-expected index 9b81f003c..3249df2d1 100644 --- a/tests/semantic/member-access-transformed-qualified.c-expected +++ b/tests/semantic/member-access-transformed-qualified.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/unary-ref-in-initializer-list.c-expected b/tests/semantic/unary-ref-in-initializer-list.c-expected index 8ae588e4c..7be69cd3c 100644 --- a/tests/semantic/unary-ref-in-initializer-list.c-expected +++ b/tests/semantic/unary-ref-in-initializer-list.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/unary-ref-in-member-initializer.c-expected b/tests/semantic/unary-ref-in-member-initializer.c-expected index edbe79894..651ace172 100644 --- a/tests/semantic/unary-ref-in-member-initializer.c-expected +++ b/tests/semantic/unary-ref-in-member-initializer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-buildin.c-expected b/tests/semantic/with-buildin.c-expected index f0680490d..3aec6b736 100644 --- a/tests/semantic/with-buildin.c-expected +++ b/tests/semantic/with-buildin.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/semantic/with-compact.c-expected b/tests/semantic/with-compact.c-expected index 3172471f0..7a5c4edbf 100644 --- a/tests/semantic/with-compact.c-expected +++ b/tests/semantic/with-compact.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-declaration-cast-type.c-expected b/tests/semantic/with-declaration-cast-type.c-expected index c950688d8..5999a551e 100644 --- a/tests/semantic/with-declaration-cast-type.c-expected +++ b/tests/semantic/with-declaration-cast-type.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-declaration.c-expected b/tests/semantic/with-declaration.c-expected index e8591024a..86de14fbb 100644 --- a/tests/semantic/with-declaration.c-expected +++ b/tests/semantic/with-declaration.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-dereferenced-pointer.c-expected b/tests/semantic/with-dereferenced-pointer.c-expected index 7a16749ec..098910b05 100644 --- a/tests/semantic/with-dereferenced-pointer.c-expected +++ b/tests/semantic/with-dereferenced-pointer.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-enum-member.c-expected b/tests/semantic/with-enum-member.c-expected index 73f49b1a8..f263cbd61 100644 --- a/tests/semantic/with-enum-member.c-expected +++ b/tests/semantic/with-enum-member.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-null.c-expected b/tests/semantic/with-null.c-expected index 9b0d9161e..92b00e08c 100644 --- a/tests/semantic/with-null.c-expected +++ b/tests/semantic/with-null.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/semantic/with-string.c-expected b/tests/semantic/with-string.c-expected index 2f52a54aa..6f65dfd5e 100644 --- a/tests/semantic/with-string.c-expected +++ b/tests/semantic/with-string.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/semantic/with-value.c-expected b/tests/semantic/with-value.c-expected index 2d8039f34..e3a7c741f 100644 --- a/tests/semantic/with-value.c-expected +++ b/tests/semantic/with-value.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _g_free0(var) (var = (g_free (var), NULL)) diff --git a/tests/structs/bug530605.c-expected b/tests/structs/bug530605.c-expected index cf2f6884c..56263a14f 100644 --- a/tests/structs/bug530605.c-expected +++ b/tests/structs/bug530605.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug572091.c-expected b/tests/structs/bug572091.c-expected index 942ee1dba..cecdaeee1 100644 --- a/tests/structs/bug572091.c-expected +++ b/tests/structs/bug572091.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug583603.c-expected b/tests/structs/bug583603.c-expected index 5a657481e..fa7bc8ac3 100644 --- a/tests/structs/bug583603.c-expected +++ b/tests/structs/bug583603.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug595587.c-expected b/tests/structs/bug595587.c-expected index ca52f593c..d8c827620 100644 --- a/tests/structs/bug595587.c-expected +++ b/tests/structs/bug595587.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug596144.c-expected b/tests/structs/bug596144.c-expected index f991e9279..f35ba0d5a 100644 --- a/tests/structs/bug596144.c-expected +++ b/tests/structs/bug596144.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug603056.c-expected b/tests/structs/bug603056.c-expected index da56a9e9b..75894976a 100644 --- a/tests/structs/bug603056.c-expected +++ b/tests/structs/bug603056.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug606202.c-expected b/tests/structs/bug606202.c-expected index 3bcc47d98..f2c34b5f4 100644 --- a/tests/structs/bug606202.c-expected +++ b/tests/structs/bug606202.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug609642.c-expected b/tests/structs/bug609642.c-expected index e39196bc6..d30e12aff 100644 --- a/tests/structs/bug609642.c-expected +++ b/tests/structs/bug609642.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug613513.c-expected b/tests/structs/bug613513.c-expected index 6d21fd4f9..3f49ada95 100644 --- a/tests/structs/bug613513.c-expected +++ b/tests/structs/bug613513.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug613825.c-expected b/tests/structs/bug613825.c-expected index 7ca374f8f..bc329ee46 100644 --- a/tests/structs/bug613825.c-expected +++ b/tests/structs/bug613825.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug621176.c-expected b/tests/structs/bug621176.c-expected index 8d2da63fe..0c1fdea9d 100644 --- a/tests/structs/bug621176.c-expected +++ b/tests/structs/bug621176.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug622422.c-expected b/tests/structs/bug622422.c-expected index a39fb3a94..4db35e85e 100644 --- a/tests/structs/bug622422.c-expected +++ b/tests/structs/bug622422.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug623092.c-expected b/tests/structs/bug623092.c-expected index cb99b316f..4b44ad623 100644 --- a/tests/structs/bug623092.c-expected +++ b/tests/structs/bug623092.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug651441.c-expected b/tests/structs/bug651441.c-expected index 2944fbf5a..8ca3d62c6 100644 --- a/tests/structs/bug651441.c-expected +++ b/tests/structs/bug651441.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug654646.c-expected b/tests/structs/bug654646.c-expected index a5a00ddb4..6c0461bed 100644 --- a/tests/structs/bug654646.c-expected +++ b/tests/structs/bug654646.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug654753.c-expected b/tests/structs/bug654753.c-expected index 1cce8fa64..e989afae3 100644 --- a/tests/structs/bug654753.c-expected +++ b/tests/structs/bug654753.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug656693.c-expected b/tests/structs/bug656693.c-expected index 7460e5020..7bee7c677 100644 --- a/tests/structs/bug656693.c-expected +++ b/tests/structs/bug656693.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug657378.c-expected b/tests/structs/bug657378.c-expected index 2e22531ab..48222861a 100644 --- a/tests/structs/bug657378.c-expected +++ b/tests/structs/bug657378.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug658048.c-expected b/tests/structs/bug658048.c-expected index ecf07b97b..2e687523f 100644 --- a/tests/structs/bug658048.c-expected +++ b/tests/structs/bug658048.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif static void _vala_main (void); diff --git a/tests/structs/bug660426.c-expected b/tests/structs/bug660426.c-expected index 96588a906..7fdc4c651 100644 --- a/tests/structs/bug660426.c-expected +++ b/tests/structs/bug660426.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug661945.c-expected b/tests/structs/bug661945.c-expected index 722111a16..f84a34671 100644 --- a/tests/structs/bug661945.c-expected +++ b/tests/structs/bug661945.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug667890.c-expected b/tests/structs/bug667890.c-expected index 6ac2ad4f1..e60bbe67a 100644 --- a/tests/structs/bug667890.c-expected +++ b/tests/structs/bug667890.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug669580.c-expected b/tests/structs/bug669580.c-expected index fe0fc3fc1..e8af339b9 100644 --- a/tests/structs/bug669580.c-expected +++ b/tests/structs/bug669580.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug685177.c-expected b/tests/structs/bug685177.c-expected index dfeeef8cd..d7c90f5b0 100644 --- a/tests/structs/bug685177.c-expected +++ b/tests/structs/bug685177.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug686190.c-expected b/tests/structs/bug686190.c-expected index 0b9f9438e..d010d6f07 100644 --- a/tests/structs/bug686190.c-expected +++ b/tests/structs/bug686190.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug688732.c-expected b/tests/structs/bug688732.c-expected index ca8e1a10b..44bde2ccd 100644 --- a/tests/structs/bug688732.c-expected +++ b/tests/structs/bug688732.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug690380.c-expected b/tests/structs/bug690380.c-expected index 21c0e099a..d9a791aa7 100644 --- a/tests/structs/bug690380.c-expected +++ b/tests/structs/bug690380.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug694140.c-expected b/tests/structs/bug694140.c-expected index aee5dbbae..e84e83683 100644 --- a/tests/structs/bug694140.c-expected +++ b/tests/structs/bug694140.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug749952.c-expected b/tests/structs/bug749952.c-expected index bc392ed73..c39de91e2 100644 --- a/tests/structs/bug749952.c-expected +++ b/tests/structs/bug749952.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug775761.c-expected b/tests/structs/bug775761.c-expected index b42af28a3..c0bac0cc7 100644 --- a/tests/structs/bug775761.c-expected +++ b/tests/structs/bug775761.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug777194-2.c-expected b/tests/structs/bug777194-2.c-expected index cf3a2b05a..d40a651e8 100644 --- a/tests/structs/bug777194-2.c-expected +++ b/tests/structs/bug777194-2.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/bug777194.c-expected b/tests/structs/bug777194.c-expected index d970efd68..e914882f9 100644 --- a/tests/structs/bug777194.c-expected +++ b/tests/structs/bug777194.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/cast-struct-boxed.c-expected b/tests/structs/cast-struct-boxed.c-expected index 8afde0433..879e70a7b 100644 --- a/tests/structs/cast-struct-boxed.c-expected +++ b/tests/structs/cast-struct-boxed.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/constructor-params-array.c-expected b/tests/structs/constructor-params-array.c-expected index 3f0ee948e..56c9ac75a 100644 --- a/tests/structs/constructor-params-array.c-expected +++ b/tests/structs/constructor-params-array.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/constructor-variadic.c-expected b/tests/structs/constructor-variadic.c-expected index fa5de8b5c..0f71bc3ea 100644 --- a/tests/structs/constructor-variadic.c-expected +++ b/tests/structs/constructor-variadic.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/default-gtype.c-expected b/tests/structs/default-gtype.c-expected index 506f88717..863480481 100644 --- a/tests/structs/default-gtype.c-expected +++ b/tests/structs/default-gtype.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/gmutex.c-expected b/tests/structs/gmutex.c-expected index 2244b227b..66fd7f990 100644 --- a/tests/structs/gmutex.c-expected +++ b/tests/structs/gmutex.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); diff --git a/tests/structs/gtype-base-struct.c-expected b/tests/structs/gtype-base-struct.c-expected index ab5e76d2d..772e37a9b 100644 --- a/tests/structs/gtype-base-struct.c-expected +++ b/tests/structs/gtype-base-struct.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/gvalue-implicit-comparison.c-expected b/tests/structs/gvalue-implicit-comparison.c-expected index a38696165..c33995811 100644 --- a/tests/structs/gvalue-implicit-comparison.c-expected +++ b/tests/structs/gvalue-implicit-comparison.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/gvalue.c-expected b/tests/structs/gvalue.c-expected index e68791ed6..7a3514295 100644 --- a/tests/structs/gvalue.c-expected +++ b/tests/structs/gvalue.c-expected @@ -8,9 +8,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -18,7 +17,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -26,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -36,7 +34,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -51,6 +48,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/namespace-field-nested-initializer.c-expected b/tests/structs/namespace-field-nested-initializer.c-expected index 77fddbe8a..e208aa7df 100644 --- a/tests/structs/namespace-field-nested-initializer.c-expected +++ b/tests/structs/namespace-field-nested-initializer.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/properties.c-expected b/tests/structs/properties.c-expected index 1d54c97a3..036958817 100644 --- a/tests/structs/properties.c-expected +++ b/tests/structs/properties.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/simple-type-boxed.c-expected b/tests/structs/simple-type-boxed.c-expected index 098f7da41..4c8d2cebe 100644 --- a/tests/structs/simple-type-boxed.c-expected +++ b/tests/structs/simple-type-boxed.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef struct _Foo Foo; diff --git a/tests/structs/simple-type-constructor.c-expected b/tests/structs/simple-type-constructor.c-expected index 358cc05af..60d9f3dfc 100644 --- a/tests/structs/simple-type-constructor.c-expected +++ b/tests/structs/simple-type-constructor.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-base-types.c-expected b/tests/structs/struct-base-types.c-expected index ba87af575..5c57a4252 100644 --- a/tests/structs/struct-base-types.c-expected +++ b/tests/structs/struct-base-types.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-boxed-cast.c-expected b/tests/structs/struct-boxed-cast.c-expected index 9c6a529fa..d8989d015 100644 --- a/tests/structs/struct-boxed-cast.c-expected +++ b/tests/structs/struct-boxed-cast.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-initializer-list-in-array.c-expected b/tests/structs/struct-initializer-list-in-array.c-expected index c47b36b9e..39393a9e6 100644 --- a/tests/structs/struct-initializer-list-in-array.c-expected +++ b/tests/structs/struct-initializer-list-in-array.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-initializer-list-nested.c-expected b/tests/structs/struct-initializer-list-nested.c-expected index d9fe83085..d9100a7cf 100644 --- a/tests/structs/struct-initializer-list-nested.c-expected +++ b/tests/structs/struct-initializer-list-nested.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-no-gtype-inherit.c-expected b/tests/structs/struct-no-gtype-inherit.c-expected index cbd963a44..7e40e2d6a 100644 --- a/tests/structs/struct-no-gtype-inherit.c-expected +++ b/tests/structs/struct-no-gtype-inherit.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif typedef int32_t foo_t; diff --git a/tests/structs/struct-no-gtype.c-expected b/tests/structs/struct-no-gtype.c-expected index 0a4c1bd54..946418600 100644 --- a/tests/structs/struct-no-gtype.c-expected +++ b/tests/structs/struct-no-gtype.c-expected @@ -5,9 +5,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -15,7 +14,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -23,9 +21,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -33,7 +31,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -48,6 +45,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-static-field-initializer-3.c-expected b/tests/structs/struct-static-field-initializer-3.c-expected index 70a25498a..1979cf996 100644 --- a/tests/structs/struct-static-field-initializer-3.c-expected +++ b/tests/structs/struct-static-field-initializer-3.c-expected @@ -4,9 +4,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -14,7 +13,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -22,9 +20,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -32,7 +30,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -47,6 +44,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct-static-field-initializer.c-expected b/tests/structs/struct-static-field-initializer.c-expected index 772fb3b8a..905e21cdc 100644 --- a/tests/structs/struct-static-field-initializer.c-expected +++ b/tests/structs/struct-static-field-initializer.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/struct_only.c-expected b/tests/structs/struct_only.c-expected index da8f3c631..e883e0e7f 100644 --- a/tests/structs/struct_only.c-expected +++ b/tests/structs/struct_only.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/structs/structs.c-expected b/tests/structs/structs.c-expected index 4594c8630..ce18fbdeb 100644 --- a/tests/structs/structs.c-expected +++ b/tests/structs/structs.c-expected @@ -7,9 +7,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -17,7 +16,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -25,9 +23,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -35,7 +33,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -50,6 +47,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/tests/threads/threadpool.c-expected b/tests/threads/threadpool.c-expected index 3be82e22c..e4ffefcb7 100644 --- a/tests/threads/threadpool.c-expected +++ b/tests/threads/threadpool.c-expected @@ -6,9 +6,8 @@ #include #if !defined(VALA_STRICT_C) -#if !defined(__clang__) && defined(__GNUC__) +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 5) #pragma GCC diagnostic ignored "-Wchar-subscripts" -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" #pragma GCC diagnostic ignored "-Wint-conversion" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" @@ -16,7 +15,6 @@ #pragma GCC diagnostic ignored "-Wpointer-to-int-cast" #pragma GCC diagnostic ignored "-Wreturn-type" #pragma GCC diagnostic ignored "-Wsign-compare" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -24,9 +22,9 @@ #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #elif defined(__clang__) #pragma clang diagnostic ignored "-Wchar-subscripts" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wincompatible-pointer-types" #pragma clang diagnostic ignored "-Wint-conversion" #pragma clang diagnostic ignored "-Wmissing-field-initializers" @@ -34,7 +32,6 @@ #pragma clang diagnostic ignored "-Wpointer-to-int-cast" #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wsign-compare" -#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-label" #pragma clang diagnostic ignored "-Wunused-parameter" @@ -49,6 +46,9 @@ #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 8) #pragma GCC diagnostic ignored "-Wcast-function-type" #endif +#if defined(__clang__) && (__clang_major__ >= 13) +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif #endif #if !defined(VALA_EXTERN) #if defined(_WIN32) || defined(__CYGWIN__)