[vala/staging] codegen: Use __once instead of __volatile in generated code
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] codegen: Use __once instead of __volatile in generated code
- Date: Mon, 3 Jan 2022 14:08:20 +0000 (UTC)
commit c46078fa430bfcc25c26f33da991410372d44d03
Author: Val Och <v19930312 gmail com>
Date: Fri Dec 31 20:25:49 2021 +0300
codegen: Use __once instead of __volatile in generated code
This better reflects purpose of relevant variables, especially
given that they aren't volatile anymore on GLib 2.68+.
codegen/valagobjectmodule.vala | 2 +-
codegen/valatyperegisterfunction.vala | 8 +-
tests/annotations/deprecated.c-expected | 40 ++++----
tests/annotations/description.c-expected | 16 ++--
.../cast-struct-boxed-element-access.c-expected | 16 ++--
tests/arrays/class-field-initializer.c-expected | 16 ++--
tests/arrays/class-field-length-cname.c-expected | 8 +-
tests/arrays/empty-length-0.c-expected | 8 +-
tests/arrays/fixed-length-enum-value.c-expected | 16 ++--
tests/arrays/struct-field-length-cname.c-expected | 8 +-
tests/arrays/struct-initializer-null.c-expected | 8 +-
.../struct-namespaced-initializer.c-expected | 24 ++---
tests/asynchronous/bug595735.c-expected | 16 ++--
tests/asynchronous/bug595755.c-expected | 8 +-
tests/asynchronous/bug596177.c-expected | 8 +-
tests/asynchronous/bug598677.c-expected | 8 +-
tests/asynchronous/bug598697.c-expected | 8 +-
tests/asynchronous/bug598698.c-expected | 16 ++--
tests/asynchronous/bug600827.c-expected | 8 +-
tests/asynchronous/bug601558.c-expected | 16 ++--
tests/asynchronous/bug612641.c-expected | 8 +-
tests/asynchronous/bug613484.c-expected | 8 +-
tests/asynchronous/bug614294.c-expected | 48 +++++-----
tests/asynchronous/bug620740.c-expected | 8 +-
tests/asynchronous/bug626053.c-expected | 8 +-
tests/asynchronous/bug641182.c-expected | 8 +-
tests/asynchronous/bug646945.c-expected | 24 ++---
tests/asynchronous/bug652252.c-expected | 16 ++--
tests/asynchronous/bug653861.c-expected | 8 +-
tests/asynchronous/bug659886.c-expected | 8 +-
tests/asynchronous/bug710103.c-expected | 8 +-
tests/asynchronous/bug741929.c-expected | 8 +-
tests/asynchronous/bug742621.c-expected | 8 +-
tests/asynchronous/bug762819.c-expected | 16 ++--
tests/asynchronous/bug783543.c-expected | 8 +-
tests/asynchronous/bug792660.c-expected | 16 ++--
tests/asynchronous/bug792942.c-expected | 8 +-
tests/asynchronous/bug793158.c-expected | 8 +-
.../constructor-argument-check.c-expected | 8 +-
tests/asynchronous/finish-name.c-expected | 16 ++--
tests/asynchronous/generator.c-expected | 16 ++--
tests/asynchronous/nowrapper.c-expected | 16 ++--
.../out-parameter-free-on-error.c-expected | 8 +-
tests/basic-types/arrays-generics.c-expected | 8 +-
tests/basic-types/arrays.c-expected | 24 ++---
tests/basic-types/bug571486.c-expected | 8 +-
tests/basic-types/bug622178.c-expected | 24 ++---
tests/basic-types/bug678791.c-expected | 8 +-
tests/basic-types/bug686336.c-expected | 8 +-
tests/basic-types/default-gtype.c-expected | 32 +++----
tests/basic-types/garray.c-expected | 16 ++--
tests/basic-types/glists_remove.c-expected | 8 +-
tests/basic-types/gptrarray.c-expected | 8 +-
.../basic-types/gvariants-unboxing-safe.c-expected | 8 +-
tests/basic-types/gvariants.c-expected | 8 +-
tests/basic-types/pointers.c-expected | 8 +-
tests/chainup/bug791785.c-expected | 24 ++---
tests/chainup/class-base-foo.c-expected | 16 ++--
tests/chainup/class-base.c-expected | 16 ++--
tests/chainup/class-object.c-expected | 8 +-
tests/chainup/class-this-foo.c-expected | 8 +-
tests/chainup/class-this.c-expected | 8 +-
tests/chainup/method-lambda-base.c-expected | 16 ++--
tests/chainup/no-chainup.c-expected | 16 ++--
tests/chainup/signal-default-handler.c-expected | 16 ++--
tests/chainup/struct-base-foo.c-expected | 16 ++--
tests/chainup/struct-base.c-expected | 16 ++--
tests/chainup/struct-this-foo.c-expected | 8 +-
tests/chainup/struct-this.c-expected | 8 +-
tests/constants/member-access-enum.c-expected | 16 ++--
tests/constants/member-access.c-expected | 16 ++--
tests/control-flow/break.c-expected | 8 +-
tests/control-flow/bug736774-1.c-expected | 8 +-
tests/control-flow/bug761267-1.c-expected | 8 +-
tests/control-flow/bug761267-2.c-expected | 8 +-
tests/control-flow/coalesce-right-value.c-expected | 8 +-
.../expressions-conditional.c-expected | 8 +-
tests/control-flow/for-switch-continue.c-expected | 8 +-
.../local-clash-with-implicit-this.c-expected | 8 +-
.../control-flow/null-conditional-bool.c-expected | 8 +-
.../pre-post-increment-property.c-expected | 8 +-
tests/control-flow/sideeffects.c-expected | 8 +-
tests/control-flow/switch-enum.c-expected | 8 +-
tests/control-flow/switch.c-expected | 16 ++--
tests/dbus/arrays_client.c-expected | 8 +-
tests/dbus/arrays_server.c-expected | 8 +-
tests/dbus/async-bus_client.c-expected | 8 +-
tests/dbus/async-bus_server.c-expected | 8 +-
tests/dbus/async-connection_client.c-expected | 8 +-
tests/dbus/async-connection_server.c-expected | 8 +-
tests/dbus/async-errors_client.c-expected | 8 +-
tests/dbus/async-errors_server.c-expected | 8 +-
tests/dbus/async-no-reply_client.c-expected | 8 +-
tests/dbus/async-no-reply_server.c-expected | 8 +-
tests/dbus/async_client.c-expected | 8 +-
tests/dbus/async_server.c-expected | 8 +-
tests/dbus/basic-types_client.c-expected | 8 +-
tests/dbus/basic-types_server.c-expected | 8 +-
tests/dbus/bug596862.c-expected | 8 +-
tests/dbus/bug602003_client.c-expected | 8 +-
tests/dbus/bug602003_server.c-expected | 8 +-
tests/dbus/bug735437_client.c-expected | 8 +-
tests/dbus/bug735437_server.c-expected | 8 +-
tests/dbus/bug782719_client.c-expected | 8 +-
tests/dbus/bug782719_server.c-expected | 8 +-
tests/dbus/bug783002_client.c-expected | 8 +-
tests/dbus/bug783002_server.c-expected | 8 +-
tests/dbus/bug792277.c-expected | 16 ++--
tests/dbus/connection_client.c-expected | 8 +-
tests/dbus/connection_server.c-expected | 8 +-
tests/dbus/dicts_client.c-expected | 8 +-
tests/dbus/dicts_server.c-expected | 24 ++---
tests/dbus/dynamic-method_server.c-expected | 8 +-
tests/dbus/enum-string-marshalling.c-expected | 16 ++--
tests/dbus/errors_client.c-expected | 8 +-
tests/dbus/errors_server.c-expected | 8 +-
tests/dbus/filedescriptor-async_client.c-expected | 8 +-
tests/dbus/filedescriptor-async_server.c-expected | 8 +-
tests/dbus/filedescriptor-errors_client.c-expected | 8 +-
tests/dbus/filedescriptor-errors_server.c-expected | 8 +-
tests/dbus/filedescriptor_client.c-expected | 8 +-
tests/dbus/filedescriptor_server.c-expected | 8 +-
tests/dbus/generics_client.c-expected | 8 +-
tests/dbus/generics_server.c-expected | 8 +-
tests/dbus/interface-info_client.c-expected | 8 +-
tests/dbus/interface-info_server.c-expected | 8 +-
tests/dbus/no-reply_client.c-expected | 8 +-
tests/dbus/no-reply_server.c-expected | 8 +-
tests/dbus/rawvariants_client.c-expected | 16 ++--
tests/dbus/rawvariants_server.c-expected | 16 ++--
tests/dbus/signals_client.c-expected | 8 +-
tests/dbus/signals_server.c-expected | 8 +-
tests/dbus/structs_client.c-expected | 16 ++--
tests/dbus/structs_server.c-expected | 16 ++--
tests/delegates/bug539166.c-expected | 8 +-
tests/delegates/bug595610.c-expected | 8 +-
tests/delegates/bug639751.c-expected | 8 +-
tests/delegates/bug659778.c-expected | 16 ++--
tests/delegates/bug683925.c-expected | 8 +-
tests/delegates/casting.c-expected | 8 +-
tests/delegates/compatible.c-expected | 16 ++--
tests/delegates/delegates.c-expected | 32 +++----
tests/delegates/error-pos.c-expected | 8 +-
tests/delegates/fields-no-target.c-expected | 16 ++--
tests/delegates/gclosure-conversion.c-expected | 16 ++--
tests/delegates/lambda-shared-closure.c-expected | 8 +-
tests/delegates/reference_transfer.c-expected | 8 +-
tests/enums/bug614424.c-expected | 8 +-
tests/enums/bug666035.c-expected | 24 ++---
tests/enums/bug673879.c-expected | 8 +-
tests/enums/bug763831.c-expected | 16 ++--
tests/enums/bug780050.c-expected | 8 +-
tests/enums/enum-boxed.c-expected | 16 ++--
tests/enums/enum_only.c-expected | 8 +-
tests/enums/enums.c-expected | 24 ++---
tests/enums/flags.c-expected | 8 +-
tests/enums/from-0-literal.c-expected | 16 ++--
tests/enums/in-inference.c-expected | 8 +-
tests/enums/switch.c-expected | 8 +-
tests/enums/unsafe-assignment.c-expected | 8 +-
tests/errors/bug567181.c-expected | 8 +-
tests/errors/bug596228.c-expected | 8 +-
tests/errors/bug623049.c-expected | 16 ++--
tests/errors/bug627090.c-expected | 8 +-
tests/errors/bug762377.c-expected | 8 +-
tests/errors/errors.c-expected | 8 +-
tests/errors/unhandled.c-expected | 8 +-
tests/generics/arrays.c-expected | 8 +-
tests/generics/bug640330.c-expected | 16 ++--
tests/generics/bug694765-2.c-expected | 24 ++---
tests/generics/constructor-chain-up.c-expected | 8 +-
.../inference-argument-may-fail.c-expected | 8 +-
.../generics/inference-static-function.c-expected | 8 +-
tests/generics/integer-member-access.c-expected | 8 +-
tests/generics/member-dup-destroy.c-expected | 8 +-
tests/generics/property-gobject-set.c-expected | 8 +-
tests/generics/property-int-cast.c-expected | 8 +-
tests/generics/reference-transfer.c-expected | 8 +-
.../generics/string-literal-comparison.c-expected | 8 +-
.../generics/type-parameter-properties.c-expected | 16 ++--
.../type-parameter-property-clash.c-expected | 16 ++--
.../generics/value-pointer-type-access.c-expected | 16 ++--
tests/genie/class-abstract.c-expected | 16 ++--
tests/genie/class-field.c-expected | 8 +-
tests/genie/class-init.c-expected | 8 +-
tests/genie/class-property.c-expected | 8 +-
tests/genie/class-signal.c-expected | 8 +-
tests/genie/class.c-expected | 8 +-
tests/genie/enum-with-keyword-values.c-expected | 8 +-
tests/genie/enum.c-expected | 8 +-
tests/genie/interface.c-expected | 16 ++--
tests/genie/struct-after-class.c-expected | 16 ++--
tests/genie/struct.c-expected | 8 +-
tests/methods/argument-array-initilizer.c-expected | 8 +-
tests/methods/argument-named.c-expected | 8 +-
tests/methods/array-length-type.c-expected | 24 ++---
tests/methods/bug540483.c-expected | 40 ++++----
tests/methods/bug597426.c-expected | 8 +-
tests/methods/bug599892.c-expected | 8 +-
tests/methods/bug613483.c-expected | 8 +-
tests/methods/bug626783.c-expected | 8 +-
tests/methods/bug642350.c-expected | 16 ++--
tests/methods/bug642885.c-expected | 8 +-
tests/methods/bug642899.c-expected | 8 +-
tests/methods/bug648320.c-expected | 8 +-
tests/methods/bug652098.c-expected | 56 +++++------
tests/methods/bug663210.c-expected | 8 +-
tests/methods/bug699956.c-expected | 16 ++--
tests/methods/bug710862.c-expected | 8 +-
tests/methods/bug726347.c-expected | 8 +-
tests/methods/bug736235.c-expected | 8 +-
tests/methods/bug771964.c-expected | 16 ++--
tests/methods/bug774060.c-expected | 8 +-
tests/methods/bug791283.c-expected | 8 +-
tests/methods/closures.c-expected | 8 +-
tests/methods/contains.c-expected | 8 +-
tests/methods/delegate-target.c-expected | 24 ++---
tests/methods/extern.c-expected | 8 +-
tests/methods/generics.c-expected | 24 ++---
tests/methods/iterator.c-expected | 72 +++++++-------
tests/methods/lambda.c-expected | 8 +-
tests/methods/nowrapper-interface.c-expected | 16 ++--
.../parameter-fixed-array-initializer.c-expected | 8 +-
.../methods/parameter-out-free-on-error.c-expected | 8 +-
tests/methods/params-array-with-throws.c-expected | 8 +-
tests/methods/params-array.c-expected | 8 +-
tests/methods/prepostconditions.c-expected | 16 ++--
tests/methods/print-attribute.c-expected | 8 +-
tests/methods/same-name.c-expected | 16 ++--
tests/methods/symbolresolution.c-expected | 8 +-
tests/methods/varargs-out.c-expected | 8 +-
tests/namespace/unique.c-expected | 8 +-
.../member-access-narrowed-instance.c-expected | 8 +-
tests/objects/bug566909.c-expected | 8 +-
tests/objects/bug588203.c-expected | 8 +-
tests/objects/bug589928.c-expected | 8 +-
tests/objects/bug593137.c-expected | 16 ++--
tests/objects/bug593260.c-expected | 8 +-
tests/objects/bug596621.c-expected | 16 ++--
tests/objects/bug597155.c-expected | 8 +-
tests/objects/bug597161.c-expected | 8 +-
tests/objects/bug613486.c-expected | 16 ++--
tests/objects/bug620675.c-expected | 16 ++--
tests/objects/bug620706.c-expected | 16 ++--
tests/objects/bug624594.c-expected | 8 +-
tests/objects/bug626038-2.c-expected | 16 ++--
tests/objects/bug626038.c-expected | 8 +-
tests/objects/bug628639.c-expected | 8 +-
tests/objects/bug629593.c-expected | 16 ++--
tests/objects/bug631267.c-expected | 24 ++---
tests/objects/bug634782.c-expected | 8 +-
tests/objects/bug641828.c-expected | 16 ++--
tests/objects/bug642809.c-expected | 24 ++---
tests/objects/bug643711.c-expected | 16 ++--
tests/objects/bug644938.c-expected | 16 ++--
tests/objects/bug646362.c-expected | 8 +-
tests/objects/bug646792.c-expected | 8 +-
tests/objects/bug653138.c-expected | 8 +-
tests/objects/bug654702.c-expected | 16 ++--
tests/objects/bug663134.c-expected | 8 +-
tests/objects/bug667668.c-expected | 16 ++--
tests/objects/bug681356.c-expected | 8 +-
tests/objects/bug695671.c-expected | 8 +-
tests/objects/bug702736.c-expected | 32 +++----
tests/objects/bug731547.c-expected | 8 +-
tests/objects/bug751338.c-expected | 8 +-
tests/objects/bug758816.c-expected | 24 ++---
tests/objects/bug764481.c-expected | 40 ++++----
tests/objects/bug766739.c-expected | 24 ++---
tests/objects/bug778632.c-expected | 8 +-
tests/objects/bug779219.c-expected | 24 ++---
tests/objects/bug779955.c-expected | 8 +-
tests/objects/bug783897.c-expected | 24 ++---
tests/objects/bug788964.c-expected | 16 ++--
tests/objects/bug795521.c-expected | 8 +-
tests/objects/chainup.c-expected | 16 ++--
tests/objects/class-ccode-cprefix.c-expected | 16 ++--
tests/objects/class-destroysinstance.c-expected | 8 +-
tests/objects/class-inner-types.c-expected | 24 ++---
tests/objects/class-new-no-override.c-expected | 16 ++--
tests/objects/class-partial-nested.c-expected | 8 +-
tests/objects/class-partial.c-expected | 24 ++---
tests/objects/class-vfunc-base-access.c-expected | 16 ++--
tests/objects/class_only.c-expected | 8 +-
.../classes-implicit-implementation.c-expected | 48 +++++-----
.../objects/classes-interfaces-virtuals.c-expected | 32 +++----
tests/objects/classes-interfaces.c-expected | 32 +++----
tests/objects/classes.c-expected | 88 ++++++++---------
tests/objects/compact-class-destructor.c-expected | 8 +-
tests/objects/constructor-inner-error.c-expected | 8 +-
tests/objects/constructor-variadic.c-expected | 8 +-
tests/objects/constructors.c-expected | 24 ++---
tests/objects/destructors.c-expected | 24 ++---
tests/objects/dynamic.c-expected | 16 ++--
tests/objects/fields.c-expected | 40 ++++----
tests/objects/gobject-class-lifetime.c-expected | 8 +-
tests/objects/gtype-class-lifetime.c-expected | 8 +-
tests/objects/initially-unowned.c-expected | 8 +-
tests/objects/instance-comparison.c-expected | 40 ++++----
.../interface-abstract-async-override.c-expected | 16 ++--
.../objects/interface-async-base-access.c-expected | 24 ++---
.../interface-async-captured-generic.c-expected | 16 ++--
tests/objects/interface-base-access.c-expected | 24 ++---
tests/objects/interface-generics.c-expected | 16 ++--
tests/objects/interface-inner-types.c-expected | 32 +++----
.../interface-property-base-access.c-expected | 32 +++----
.../interface-property-base-impl.c-expected | 24 ++---
.../objects/interface-property-delegate.c-expected | 24 ++---
.../objects/interface-property-override.c-expected | 32 +++----
.../objects/interface-virtual-override.c-expected | 16 ++--
tests/objects/interface_only.c-expected | 8 +-
tests/objects/interfaces.c-expected | 24 ++---
.../member-initializer-base-properties.c-expected | 24 ++---
.../member-initializer-chained-2.c-expected | 16 ++--
.../objects/member-initializer-chained.c-expected | 16 ++--
...er-initializer-property-owned-setter.c-expected | 16 ++--
.../objects/member-initializer-property.c-expected | 24 ++---
tests/objects/methods.c-expected | 104 ++++++++++-----------
tests/objects/paramspec.c-expected | 32 +++----
tests/objects/properties.c-expected | 96 +++++++++----------
tests/objects/property-array.c-expected | 24 ++---
tests/objects/property-base-access.c-expected | 16 ++--
tests/objects/property-construct-only.c-expected | 32 +++----
tests/objects/property-delegate-owned.c-expected | 24 ++---
tests/objects/property-delegate.c-expected | 16 ++--
tests/objects/property-enum.c-expected | 32 +++----
tests/objects/property-gboxed-nullable.c-expected | 24 ++---
.../property-notify-owned-getter.c-expected | 24 ++---
tests/objects/property-notify.c-expected | 8 +-
tests/objects/property-ownership.c-expected | 24 ++---
tests/objects/property-read-only-auto.c-expected | 32 +++----
.../property-real-struct-assignment.c-expected | 24 ++---
...property-simple-type-struct-nullable.c-expected | 8 +-
tests/objects/property-static.c-expected | 16 ++--
tests/objects/property-struct-no-gtype.c-expected | 8 +-
tests/objects/regex.c-expected | 8 +-
.../signals-default-class-handler.c-expected | 8 +-
.../objects/signals-delegate-parameter.c-expected | 16 ++--
tests/objects/signals-delegate.c-expected | 16 ++--
tests/objects/signals-enum-marshal.c-expected | 24 ++---
tests/objects/signals-error-marshal.c-expected | 16 ++--
.../objects/signals-fundamental-return.c-expected | 32 +++----
tests/objects/signals-generic-return.c-expected | 8 +-
tests/objects/signals-gobject-return.c-expected | 16 ++--
tests/objects/signals-lambda-delegate.c-expected | 8 +-
tests/objects/signals-prototype-access.c-expected | 8 +-
tests/objects/signals-struct-return.c-expected | 16 ++--
tests/objects/signals.c-expected | 48 +++++-----
tests/objects/singleton.c-expected | 28 +++---
tests/objects/test-025.c-expected | 16 ++--
tests/objects/test-026.c-expected | 16 ++--
tests/objects/test-029.c-expected | 8 +-
tests/objects/test-034.c-expected | 32 +++----
.../type-narrowing-by-precondition.c-expected | 16 ++--
tests/objects/type-narrowing-fallback.c-expected | 24 ++---
tests/objects/type-narrowing.c-expected | 24 ++---
tests/objects/with-expression.c-expected | 8 +-
tests/objects/with-instance.c-expected | 32 +++----
tests/objects/with-nested-in-lambda.c-expected | 8 +-
tests/objects/with-nested-method.c-expected | 16 ++--
tests/objects/with-nested-signal.c-expected | 16 ++--
.../with-nested-unambigous-signal.c-expected | 8 +-
tests/objects/with-nested.c-expected | 24 ++---
tests/ordering/constant-class.c-expected | 8 +-
tests/ordering/constant-enum.c-expected | 8 +-
tests/ordering/constant-struct.c-expected | 8 +-
tests/ordering/delegate-class.c-expected | 8 +-
tests/ordering/delegate-enum.c-expected | 8 +-
tests/ordering/delegate-interface.c-expected | 8 +-
tests/ordering/delegate-struct.c-expected | 8 +-
tests/ordering/struct-delegate.c-expected | 8 +-
.../member-initializer.c-expected | 16 ++--
tests/parser/lock-statement.c-expected | 8 +-
tests/parser/member-access-pointer.c-expected | 8 +-
tests/parser/member-initializer-empty.c-expected | 8 +-
.../member-initializer-trailing-comma.c-expected | 8 +-
tests/parser/member-initializer.c-expected | 8 +-
tests/parser/namespaces.c-expected | 24 ++---
tests/parser/qualified-symbol-access.c-expected | 16 ++--
tests/parser/sealed-class.c-expected | 16 ++--
tests/parser/yield-return.c-expected | 8 +-
tests/pointers/delete.c-expected | 16 ++--
tests/resolver/peek-inner-types.c-expected | 56 +++++------
tests/semantic/assignment-same-variable.c-expected | 8 +-
.../floating-reference-base-method.c-expected | 32 +++----
...ocalvariable-var-pointer-initializer.c-expected | 8 +-
...-access-static-transformed-qualified.c-expected | 16 ++--
.../member-access-static-with-instance.c-expected | 8 +-
.../member-access-transformed-qualified.c-expected | 8 +-
.../semantic/with-declaration-cast-type.c-expected | 16 ++--
tests/semantic/with-declaration.c-expected | 8 +-
.../semantic/with-dereferenced-pointer.c-expected | 8 +-
tests/semantic/with-enum-member.c-expected | 8 +-
tests/semantic/with-null.c-expected | 8 +-
tests/structs/bug530605.c-expected | 8 +-
tests/structs/bug572091.c-expected | 8 +-
tests/structs/bug583603.c-expected | 8 +-
tests/structs/bug595587.c-expected | 16 ++--
tests/structs/bug596144.c-expected | 8 +-
tests/structs/bug603056.c-expected | 8 +-
tests/structs/bug606202.c-expected | 16 ++--
tests/structs/bug613513.c-expected | 8 +-
tests/structs/bug613825.c-expected | 8 +-
tests/structs/bug621176.c-expected | 8 +-
tests/structs/bug622422.c-expected | 8 +-
tests/structs/bug623092.c-expected | 8 +-
tests/structs/bug651441.c-expected | 8 +-
tests/structs/bug654753.c-expected | 8 +-
tests/structs/bug656693.c-expected | 8 +-
tests/structs/bug660426.c-expected | 8 +-
tests/structs/bug661945.c-expected | 8 +-
tests/structs/bug667890.c-expected | 8 +-
tests/structs/bug669580.c-expected | 16 ++--
tests/structs/bug686190.c-expected | 8 +-
tests/structs/bug688732.c-expected | 16 ++--
tests/structs/bug690380.c-expected | 16 ++--
tests/structs/bug749952.c-expected | 16 ++--
tests/structs/bug775761.c-expected | 8 +-
tests/structs/bug777194.c-expected | 8 +-
tests/structs/cast-struct-boxed.c-expected | 16 ++--
tests/structs/constructor-params-array.c-expected | 8 +-
tests/structs/constructor-variadic.c-expected | 8 +-
tests/structs/default-gtype.c-expected | 8 +-
tests/structs/gtype-base-struct.c-expected | 8 +-
tests/structs/gvalue.c-expected | 32 +++----
tests/structs/properties.c-expected | 8 +-
tests/structs/struct-base-types.c-expected | 16 ++--
tests/structs/struct-boxed-cast.c-expected | 8 +-
.../struct-initializer-list-in-array.c-expected | 16 ++--
.../struct-initializer-list-nested.c-expected | 32 +++----
.../struct-static-field-initializer.c-expected | 8 +-
tests/structs/struct_only.c-expected | 8 +-
tests/structs/structs.c-expected | 40 ++++----
433 files changed, 3059 insertions(+), 3059 deletions(-)
---
diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
index 788de3e74..114692139 100644
--- a/codegen/valagobjectmodule.vala
+++ b/codegen/valagobjectmodule.vala
@@ -499,7 +499,7 @@ public class Vala.GObjectModule : GTypeModule {
if (cl.is_singleton) {
var singleton_ref_name = "%s_singleton__ref".printf (get_ccode_name (cl));
var singleton_lock_name = "%s_singleton__lock".printf (get_ccode_name (cl));
- var singleton_once_name = "%s_singleton__volatile".printf (get_ccode_name
(cl));
+ var singleton_once_name = "%s_singleton__once".printf (get_ccode_name (cl));
var singleton_ref = new CCodeDeclaration("GObject *");
singleton_ref.add_declarator (new CCodeVariableDeclarator
(singleton_ref_name, new CCodeConstant ("NULL")));
diff --git a/codegen/valatyperegisterfunction.vala b/codegen/valatyperegisterfunction.vala
index 67bb7efb9..a3236b94c 100644
--- a/codegen/valatyperegisterfunction.vala
+++ b/codegen/valatyperegisterfunction.vala
@@ -49,7 +49,7 @@ public abstract class Vala.TypeRegisterFunction {
CCodeDeclaration cdecl;
if (!plugin) {
cdecl = new CCodeDeclaration ("gsize");
- cdecl.add_declarator (new CCodeVariableDeclarator (type_id_name + "__volatile", new
CCodeConstant ("0")));
+ cdecl.add_declarator (new CCodeVariableDeclarator (type_id_name + "__once", new
CCodeConstant ("0")));
if (context.require_glib_version (2, 68)) {
cdecl.modifiers = CCodeModifiers.STATIC;
} else {
@@ -251,16 +251,16 @@ public abstract class Vala.TypeRegisterFunction {
if (!plugin) {
// the condition that guards the type initialisation
var enter = new CCodeFunctionCall (new CCodeIdentifier ("g_once_init_enter"));
- enter.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new
CCodeIdentifier (type_id_name + "__volatile")));
+ enter.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new
CCodeIdentifier (type_id_name + "__once")));
var leave = new CCodeFunctionCall (new CCodeIdentifier ("g_once_init_leave"));
- leave.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new
CCodeIdentifier (type_id_name + "__volatile")));
+ leave.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new
CCodeIdentifier (type_id_name + "__once")));
leave.add_argument (new CCodeIdentifier (type_id_name));
once_call_block.add_statement (new CCodeExpressionStatement (leave));
var cif = new CCodeIfStatement (enter, once_call_block);
type_block.add_statement (cif);
- type_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier (type_id_name
+ "__volatile")));
+ type_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier (type_id_name
+ "__once")));
type_once_block = type_init;
type_once_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier
(type_id_name)));
diff --git a/tests/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected
index ceb54da63..8b0619ad4 100644
--- a/tests/annotations/deprecated.c-expected
+++ b/tests/annotations/deprecated.c-expected
@@ -187,13 +187,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
void
@@ -326,13 +326,13 @@ fooclass_get_type_once (void)
GType
fooclass_get_type (void)
{
- static volatile gsize fooclass_type_id__volatile = 0;
- if (g_once_init_enter (&fooclass_type_id__volatile)) {
+ static volatile gsize fooclass_type_id__once = 0;
+ if (g_once_init_enter (&fooclass_type_id__once)) {
GType fooclass_type_id;
fooclass_type_id = fooclass_get_type_once ();
- g_once_init_leave (&fooclass_type_id__volatile, fooclass_type_id);
+ g_once_init_leave (&fooclass_type_id__once, fooclass_type_id);
}
- return fooclass_type_id__volatile;
+ return fooclass_type_id__once;
}
static void
@@ -438,13 +438,13 @@ afoo_get_type_once (void)
GType
afoo_get_type (void)
{
- static volatile gsize afoo_type_id__volatile = 0;
- if (g_once_init_enter (&afoo_type_id__volatile)) {
+ static volatile gsize afoo_type_id__once = 0;
+ if (g_once_init_enter (&afoo_type_id__once)) {
GType afoo_type_id;
afoo_type_id = afoo_get_type_once ();
- g_once_init_leave (&afoo_type_id__volatile, afoo_type_id);
+ g_once_init_leave (&afoo_type_id__once, afoo_type_id);
}
- return afoo_type_id__volatile;
+ return afoo_type_id__once;
}
gint
@@ -485,13 +485,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
void
@@ -528,13 +528,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
void
diff --git a/tests/annotations/description.c-expected b/tests/annotations/description.c-expected
index 51dbbc592..d6527b7e8 100644
--- a/tests/annotations/description.c-expected
+++ b/tests/annotations/description.c-expected
@@ -162,13 +162,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -219,13 +219,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/arrays/cast-struct-boxed-element-access.c-expected
b/tests/arrays/cast-struct-boxed-element-access.c-expected
index a7bff29a4..c0f2943b5 100644
--- a/tests/arrays/cast-struct-boxed-element-access.c-expected
+++ b/tests/arrays/cast-struct-boxed-element-access.c-expected
@@ -95,13 +95,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -396,13 +396,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gpointer
diff --git a/tests/arrays/class-field-initializer.c-expected b/tests/arrays/class-field-initializer.c-expected
index dff1fb667..d58abb4a8 100644
--- a/tests/arrays/class-field-initializer.c-expected
+++ b/tests/arrays/class-field-initializer.c-expected
@@ -479,13 +479,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -750,13 +750,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/arrays/class-field-length-cname.c-expected
b/tests/arrays/class-field-length-cname.c-expected
index 3fc4107e9..389a0d79a 100644
--- a/tests/arrays/class-field-length-cname.c-expected
+++ b/tests/arrays/class-field-length-cname.c-expected
@@ -258,13 +258,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/arrays/empty-length-0.c-expected b/tests/arrays/empty-length-0.c-expected
index 87791630b..d4cf9ee92 100644
--- a/tests/arrays/empty-length-0.c-expected
+++ b/tests/arrays/empty-length-0.c-expected
@@ -116,13 +116,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static gchar**
diff --git a/tests/arrays/fixed-length-enum-value.c-expected b/tests/arrays/fixed-length-enum-value.c-expected
index 9dd81c4b9..0ea904fc3 100644
--- a/tests/arrays/fixed-length-enum-value.c-expected
+++ b/tests/arrays/fixed-length-enum-value.c-expected
@@ -51,13 +51,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -86,13 +86,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
diff --git a/tests/arrays/struct-field-length-cname.c-expected
b/tests/arrays/struct-field-length-cname.c-expected
index bf19aff07..ba80ec929 100644
--- a/tests/arrays/struct-field-length-cname.c-expected
+++ b/tests/arrays/struct-field-length-cname.c-expected
@@ -103,13 +103,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/arrays/struct-initializer-null.c-expected b/tests/arrays/struct-initializer-null.c-expected
index 1f7ea2aec..4de284d9e 100644
--- a/tests/arrays/struct-initializer-null.c-expected
+++ b/tests/arrays/struct-initializer-null.c-expected
@@ -58,13 +58,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/arrays/struct-namespaced-initializer.c-expected
b/tests/arrays/struct-namespaced-initializer.c-expected
index 3ed7b2cc9..f7202d27a 100644
--- a/tests/arrays/struct-namespaced-initializer.c-expected
+++ b/tests/arrays/struct-namespaced-initializer.c-expected
@@ -124,13 +124,13 @@ manam_bar_foo_get_type_once (void)
GType
manam_bar_foo_get_type (void)
{
- static volatile gsize manam_bar_foo_type_id__volatile = 0;
- if (g_once_init_enter (&manam_bar_foo_type_id__volatile)) {
+ static volatile gsize manam_bar_foo_type_id__once = 0;
+ if (g_once_init_enter (&manam_bar_foo_type_id__once)) {
GType manam_bar_foo_type_id;
manam_bar_foo_type_id = manam_bar_foo_get_type_once ();
- g_once_init_leave (&manam_bar_foo_type_id__volatile, manam_bar_foo_type_id);
+ g_once_init_leave (&manam_bar_foo_type_id__once, manam_bar_foo_type_id);
}
- return manam_bar_foo_type_id__volatile;
+ return manam_bar_foo_type_id__once;
}
ManamBaz*
@@ -193,13 +193,13 @@ manam_baz_faz_get_type_once (void)
GType
manam_baz_faz_get_type (void)
{
- static volatile gsize manam_baz_faz_type_id__volatile = 0;
- if (g_once_init_enter (&manam_baz_faz_type_id__volatile)) {
+ static volatile gsize manam_baz_faz_type_id__once = 0;
+ if (g_once_init_enter (&manam_baz_faz_type_id__once)) {
GType manam_baz_faz_type_id;
manam_baz_faz_type_id = manam_baz_faz_get_type_once ();
- g_once_init_leave (&manam_baz_faz_type_id__volatile, manam_baz_faz_type_id);
+ g_once_init_leave (&manam_baz_faz_type_id__once, manam_baz_faz_type_id);
}
- return manam_baz_faz_type_id__volatile;
+ return manam_baz_faz_type_id__once;
}
static void
@@ -372,13 +372,13 @@ manam_baz_get_type_once (void)
GType
manam_baz_get_type (void)
{
- static volatile gsize manam_baz_type_id__volatile = 0;
- if (g_once_init_enter (&manam_baz_type_id__volatile)) {
+ static volatile gsize manam_baz_type_id__once = 0;
+ if (g_once_init_enter (&manam_baz_type_id__once)) {
GType manam_baz_type_id;
manam_baz_type_id = manam_baz_get_type_once ();
- g_once_init_leave (&manam_baz_type_id__volatile, manam_baz_type_id);
+ g_once_init_leave (&manam_baz_type_id__once, manam_baz_type_id);
}
- return manam_baz_type_id__volatile;
+ return manam_baz_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug595735.c-expected b/tests/asynchronous/bug595735.c-expected
index 0f035d9fb..377573847 100644
--- a/tests/asynchronous/bug595735.c-expected
+++ b/tests/asynchronous/bug595735.c-expected
@@ -312,13 +312,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -442,13 +442,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug595755.c-expected b/tests/asynchronous/bug595755.c-expected
index ba1b49bac..4a3b786c2 100644
--- a/tests/asynchronous/bug595755.c-expected
+++ b/tests/asynchronous/bug595755.c-expected
@@ -186,13 +186,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug596177.c-expected b/tests/asynchronous/bug596177.c-expected
index 4022aa852..f80ac45e7 100644
--- a/tests/asynchronous/bug596177.c-expected
+++ b/tests/asynchronous/bug596177.c-expected
@@ -356,13 +356,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug598677.c-expected b/tests/asynchronous/bug598677.c-expected
index 5933f8d6c..9724f6fcf 100644
--- a/tests/asynchronous/bug598677.c-expected
+++ b/tests/asynchronous/bug598677.c-expected
@@ -269,13 +269,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug598697.c-expected b/tests/asynchronous/bug598697.c-expected
index 9d7884fbb..028b443c1 100644
--- a/tests/asynchronous/bug598697.c-expected
+++ b/tests/asynchronous/bug598697.c-expected
@@ -350,13 +350,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug598698.c-expected b/tests/asynchronous/bug598698.c-expected
index ebd96d2a2..1fb02af00 100644
--- a/tests/asynchronous/bug598698.c-expected
+++ b/tests/asynchronous/bug598698.c-expected
@@ -133,13 +133,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -354,13 +354,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug600827.c-expected b/tests/asynchronous/bug600827.c-expected
index 1fab1268c..3e94f402b 100644
--- a/tests/asynchronous/bug600827.c-expected
+++ b/tests/asynchronous/bug600827.c-expected
@@ -354,13 +354,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug601558.c-expected b/tests/asynchronous/bug601558.c-expected
index 3c80e87cf..081693d16 100644
--- a/tests/asynchronous/bug601558.c-expected
+++ b/tests/asynchronous/bug601558.c-expected
@@ -396,13 +396,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -539,13 +539,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug612641.c-expected b/tests/asynchronous/bug612641.c-expected
index 5ed1f5a66..78565ef37 100644
--- a/tests/asynchronous/bug612641.c-expected
+++ b/tests/asynchronous/bug612641.c-expected
@@ -365,13 +365,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug613484.c-expected b/tests/asynchronous/bug613484.c-expected
index da6ce5340..4ddf9a962 100644
--- a/tests/asynchronous/bug613484.c-expected
+++ b/tests/asynchronous/bug613484.c-expected
@@ -73,13 +73,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/asynchronous/bug614294.c-expected b/tests/asynchronous/bug614294.c-expected
index 4845677fd..ba31c9f46 100644
--- a/tests/asynchronous/bug614294.c-expected
+++ b/tests/asynchronous/bug614294.c-expected
@@ -375,13 +375,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -539,13 +539,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -653,13 +653,13 @@ sub_bar_get_type_once (void)
GType
sub_bar_get_type (void)
{
- static volatile gsize sub_bar_type_id__volatile = 0;
- if (g_once_init_enter (&sub_bar_type_id__volatile)) {
+ static volatile gsize sub_bar_type_id__once = 0;
+ if (g_once_init_enter (&sub_bar_type_id__once)) {
GType sub_bar_type_id;
sub_bar_type_id = sub_bar_get_type_once ();
- g_once_init_leave (&sub_bar_type_id__volatile, sub_bar_type_id);
+ g_once_init_leave (&sub_bar_type_id__once, sub_bar_type_id);
}
- return sub_bar_type_id__volatile;
+ return sub_bar_type_id__once;
}
void
@@ -740,13 +740,13 @@ afoo_get_type_once (void)
GType
afoo_get_type (void)
{
- static volatile gsize afoo_type_id__volatile = 0;
- if (g_once_init_enter (&afoo_type_id__volatile)) {
+ static volatile gsize afoo_type_id__once = 0;
+ if (g_once_init_enter (&afoo_type_id__once)) {
GType afoo_type_id;
afoo_type_id = afoo_get_type_once ();
- g_once_init_leave (&afoo_type_id__volatile, afoo_type_id);
+ g_once_init_leave (&afoo_type_id__once, afoo_type_id);
}
- return afoo_type_id__volatile;
+ return afoo_type_id__once;
}
static void
@@ -854,13 +854,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
@@ -968,13 +968,13 @@ sub_baz_get_type_once (void)
GType
sub_baz_get_type (void)
{
- static volatile gsize sub_baz_type_id__volatile = 0;
- if (g_once_init_enter (&sub_baz_type_id__volatile)) {
+ static volatile gsize sub_baz_type_id__once = 0;
+ if (g_once_init_enter (&sub_baz_type_id__once)) {
GType sub_baz_type_id;
sub_baz_type_id = sub_baz_get_type_once ();
- g_once_init_leave (&sub_baz_type_id__volatile, sub_baz_type_id);
+ g_once_init_leave (&sub_baz_type_id__once, sub_baz_type_id);
}
- return sub_baz_type_id__volatile;
+ return sub_baz_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug620740.c-expected b/tests/asynchronous/bug620740.c-expected
index a14c76e90..e6a23ef23 100644
--- a/tests/asynchronous/bug620740.c-expected
+++ b/tests/asynchronous/bug620740.c-expected
@@ -70,13 +70,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug626053.c-expected b/tests/asynchronous/bug626053.c-expected
index 3d6258f60..6fa949ac1 100644
--- a/tests/asynchronous/bug626053.c-expected
+++ b/tests/asynchronous/bug626053.c-expected
@@ -357,13 +357,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug641182.c-expected b/tests/asynchronous/bug641182.c-expected
index 77f87145d..da0975cc4 100644
--- a/tests/asynchronous/bug641182.c-expected
+++ b/tests/asynchronous/bug641182.c-expected
@@ -332,13 +332,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug646945.c-expected b/tests/asynchronous/bug646945.c-expected
index 525f44f3c..8eb5f5b13 100644
--- a/tests/asynchronous/bug646945.c-expected
+++ b/tests/asynchronous/bug646945.c-expected
@@ -287,13 +287,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -392,13 +392,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -563,13 +563,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug652252.c-expected b/tests/asynchronous/bug652252.c-expected
index 7494b39ef..09097dfb5 100644
--- a/tests/asynchronous/bug652252.c-expected
+++ b/tests/asynchronous/bug652252.c-expected
@@ -204,13 +204,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -261,13 +261,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static Block1Data*
diff --git a/tests/asynchronous/bug653861.c-expected b/tests/asynchronous/bug653861.c-expected
index 1bd375fd7..380dfacdf 100644
--- a/tests/asynchronous/bug653861.c-expected
+++ b/tests/asynchronous/bug653861.c-expected
@@ -356,13 +356,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug659886.c-expected b/tests/asynchronous/bug659886.c-expected
index 653823b9d..75de1ed66 100644
--- a/tests/asynchronous/bug659886.c-expected
+++ b/tests/asynchronous/bug659886.c-expected
@@ -177,13 +177,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug710103.c-expected b/tests/asynchronous/bug710103.c-expected
index beb59a98d..0913a72b6 100644
--- a/tests/asynchronous/bug710103.c-expected
+++ b/tests/asynchronous/bug710103.c-expected
@@ -471,13 +471,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block2Data*
diff --git a/tests/asynchronous/bug741929.c-expected b/tests/asynchronous/bug741929.c-expected
index 7001c73ce..57ed28780 100644
--- a/tests/asynchronous/bug741929.c-expected
+++ b/tests/asynchronous/bug741929.c-expected
@@ -467,13 +467,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug742621.c-expected b/tests/asynchronous/bug742621.c-expected
index 5e1ceda92..093e6c43d 100644
--- a/tests/asynchronous/bug742621.c-expected
+++ b/tests/asynchronous/bug742621.c-expected
@@ -172,13 +172,13 @@ xyzzy_get_type_once (void)
GType
xyzzy_get_type (void)
{
- static volatile gsize xyzzy_type_id__volatile = 0;
- if (g_once_init_enter (&xyzzy_type_id__volatile)) {
+ static volatile gsize xyzzy_type_id__once = 0;
+ if (g_once_init_enter (&xyzzy_type_id__once)) {
GType xyzzy_type_id;
xyzzy_type_id = xyzzy_get_type_once ();
- g_once_init_leave (&xyzzy_type_id__volatile, xyzzy_type_id);
+ g_once_init_leave (&xyzzy_type_id__once, xyzzy_type_id);
}
- return xyzzy_type_id__volatile;
+ return xyzzy_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug762819.c-expected b/tests/asynchronous/bug762819.c-expected
index ecaa4d039..ffb97eca0 100644
--- a/tests/asynchronous/bug762819.c-expected
+++ b/tests/asynchronous/bug762819.c-expected
@@ -191,13 +191,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -312,13 +312,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/asynchronous/bug783543.c-expected b/tests/asynchronous/bug783543.c-expected
index 12532c48e..9d3542f63 100644
--- a/tests/asynchronous/bug783543.c-expected
+++ b/tests/asynchronous/bug783543.c-expected
@@ -193,13 +193,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/asynchronous/bug792660.c-expected b/tests/asynchronous/bug792660.c-expected
index 1e7675af0..20c76608d 100644
--- a/tests/asynchronous/bug792660.c-expected
+++ b/tests/asynchronous/bug792660.c-expected
@@ -333,13 +333,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -468,13 +468,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/asynchronous/bug792942.c-expected b/tests/asynchronous/bug792942.c-expected
index 23a053bd8..841d2cf0b 100644
--- a/tests/asynchronous/bug792942.c-expected
+++ b/tests/asynchronous/bug792942.c-expected
@@ -347,13 +347,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/bug793158.c-expected b/tests/asynchronous/bug793158.c-expected
index 53f775245..218575392 100644
--- a/tests/asynchronous/bug793158.c-expected
+++ b/tests/asynchronous/bug793158.c-expected
@@ -194,13 +194,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/asynchronous/constructor-argument-check.c-expected
b/tests/asynchronous/constructor-argument-check.c-expected
index 036038929..76d364bb0 100644
--- a/tests/asynchronous/constructor-argument-check.c-expected
+++ b/tests/asynchronous/constructor-argument-check.c-expected
@@ -358,13 +358,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/asynchronous/finish-name.c-expected b/tests/asynchronous/finish-name.c-expected
index 3f727800f..e12dcc9b9 100644
--- a/tests/asynchronous/finish-name.c-expected
+++ b/tests/asynchronous/finish-name.c-expected
@@ -628,13 +628,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -759,13 +759,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/asynchronous/generator.c-expected b/tests/asynchronous/generator.c-expected
index 910916b6d..56db316e6 100644
--- a/tests/asynchronous/generator.c-expected
+++ b/tests/asynchronous/generator.c-expected
@@ -606,13 +606,13 @@ generator_get_type_once (void)
GType
generator_get_type (void)
{
- static volatile gsize generator_type_id__volatile = 0;
- if (g_once_init_enter (&generator_type_id__volatile)) {
+ static volatile gsize generator_type_id__once = 0;
+ if (g_once_init_enter (&generator_type_id__once)) {
GType generator_type_id;
generator_type_id = generator_get_type_once ();
- g_once_init_leave (&generator_type_id__volatile, generator_type_id);
+ g_once_init_leave (&generator_type_id__once, generator_type_id);
}
- return generator_type_id__volatile;
+ return generator_type_id__once;
}
gpointer
@@ -767,13 +767,13 @@ int_generator_get_type_once (void)
GType
int_generator_get_type (void)
{
- static volatile gsize int_generator_type_id__volatile = 0;
- if (g_once_init_enter (&int_generator_type_id__volatile)) {
+ static volatile gsize int_generator_type_id__once = 0;
+ if (g_once_init_enter (&int_generator_type_id__once)) {
GType int_generator_type_id;
int_generator_type_id = int_generator_get_type_once ();
- g_once_init_leave (&int_generator_type_id__volatile, int_generator_type_id);
+ g_once_init_leave (&int_generator_type_id__once, int_generator_type_id);
}
- return int_generator_type_id__volatile;
+ return int_generator_type_id__once;
}
static void
diff --git a/tests/asynchronous/nowrapper.c-expected b/tests/asynchronous/nowrapper.c-expected
index 8b388a6ff..7f1f988c5 100644
--- a/tests/asynchronous/nowrapper.c-expected
+++ b/tests/asynchronous/nowrapper.c-expected
@@ -145,13 +145,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -326,13 +326,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/asynchronous/out-parameter-free-on-error.c-expected
b/tests/asynchronous/out-parameter-free-on-error.c-expected
index 42cb84ff8..f6468651b 100644
--- a/tests/asynchronous/out-parameter-free-on-error.c-expected
+++ b/tests/asynchronous/out-parameter-free-on-error.c-expected
@@ -150,13 +150,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/basic-types/arrays-generics.c-expected b/tests/basic-types/arrays-generics.c-expected
index 348c30a16..01da8c6d5 100644
--- a/tests/basic-types/arrays-generics.c-expected
+++ b/tests/basic-types/arrays-generics.c-expected
@@ -408,13 +408,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
void
diff --git a/tests/basic-types/arrays.c-expected b/tests/basic-types/arrays.c-expected
index 36de500e9..6575f3b3a 100644
--- a/tests/basic-types/arrays.c-expected
+++ b/tests/basic-types/arrays.c-expected
@@ -1390,13 +1390,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -1425,13 +1425,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -1460,13 +1460,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static gboolean
diff --git a/tests/basic-types/bug571486.c-expected b/tests/basic-types/bug571486.c-expected
index 02368c6ef..994911177 100644
--- a/tests/basic-types/bug571486.c-expected
+++ b/tests/basic-types/bug571486.c-expected
@@ -335,13 +335,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/basic-types/bug622178.c-expected b/tests/basic-types/bug622178.c-expected
index 53be6b514..e227298b5 100644
--- a/tests/basic-types/bug622178.c-expected
+++ b/tests/basic-types/bug622178.c-expected
@@ -139,13 +139,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static guint8*
@@ -215,13 +215,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -250,13 +250,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/basic-types/bug678791.c-expected b/tests/basic-types/bug678791.c-expected
index a26bf9a1c..9826ce745 100644
--- a/tests/basic-types/bug678791.c-expected
+++ b/tests/basic-types/bug678791.c-expected
@@ -44,13 +44,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gboolean
diff --git a/tests/basic-types/bug686336.c-expected b/tests/basic-types/bug686336.c-expected
index 040fedcc8..cec001168 100644
--- a/tests/basic-types/bug686336.c-expected
+++ b/tests/basic-types/bug686336.c-expected
@@ -358,13 +358,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/basic-types/default-gtype.c-expected b/tests/basic-types/default-gtype.c-expected
index e634cf441..4d1268f2e 100644
--- a/tests/basic-types/default-gtype.c-expected
+++ b/tests/basic-types/default-gtype.c-expected
@@ -102,13 +102,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static GType
@@ -123,13 +123,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static GType
@@ -144,13 +144,13 @@ foo_flag_get_type_once (void)
GType
foo_flag_get_type (void)
{
- static volatile gsize foo_flag_type_id__volatile = 0;
- if (g_once_init_enter (&foo_flag_type_id__volatile)) {
+ static volatile gsize foo_flag_type_id__once = 0;
+ if (g_once_init_enter (&foo_flag_type_id__once)) {
GType foo_flag_type_id;
foo_flag_type_id = foo_flag_get_type_once ();
- g_once_init_leave (&foo_flag_type_id__volatile, foo_flag_type_id);
+ g_once_init_leave (&foo_flag_type_id__once, foo_flag_type_id);
}
- return foo_flag_type_id__volatile;
+ return foo_flag_type_id__once;
}
GQuark
@@ -185,13 +185,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
BarStruct*
diff --git a/tests/basic-types/garray.c-expected b/tests/basic-types/garray.c-expected
index 729465303..e81314d57 100644
--- a/tests/basic-types/garray.c-expected
+++ b/tests/basic-types/garray.c-expected
@@ -129,13 +129,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -196,13 +196,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
static void
diff --git a/tests/basic-types/glists_remove.c-expected b/tests/basic-types/glists_remove.c-expected
index 48509c5f8..f8407854b 100644
--- a/tests/basic-types/glists_remove.c-expected
+++ b/tests/basic-types/glists_remove.c-expected
@@ -101,13 +101,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
diff --git a/tests/basic-types/gptrarray.c-expected b/tests/basic-types/gptrarray.c-expected
index 8f9b4d113..47cbf5bec 100644
--- a/tests/basic-types/gptrarray.c-expected
+++ b/tests/basic-types/gptrarray.c-expected
@@ -140,13 +140,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gint
diff --git a/tests/basic-types/gvariants-unboxing-safe.c-expected
b/tests/basic-types/gvariants-unboxing-safe.c-expected
index acd53d71c..0867cdfb6 100644
--- a/tests/basic-types/gvariants-unboxing-safe.c-expected
+++ b/tests/basic-types/gvariants-unboxing-safe.c-expected
@@ -119,13 +119,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gboolean*
diff --git a/tests/basic-types/gvariants.c-expected b/tests/basic-types/gvariants.c-expected
index c12ca233b..0b8d1d0e3 100644
--- a/tests/basic-types/gvariants.c-expected
+++ b/tests/basic-types/gvariants.c-expected
@@ -733,13 +733,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GVariant*
diff --git a/tests/basic-types/pointers.c-expected b/tests/basic-types/pointers.c-expected
index 5bc716798..ed1a1aa5d 100644
--- a/tests/basic-types/pointers.c-expected
+++ b/tests/basic-types/pointers.c-expected
@@ -128,12 +128,12 @@ simple_struct_get_type_once (void)
GType
simple_struct_get_type (void)
{
- static volatile gsize simple_struct_type_id__volatile = 0;
- if (g_once_init_enter (&simple_struct_type_id__volatile)) {
+ static volatile gsize simple_struct_type_id__once = 0;
+ if (g_once_init_enter (&simple_struct_type_id__once)) {
GType simple_struct_type_id;
simple_struct_type_id = simple_struct_get_type_once ();
- g_once_init_leave (&simple_struct_type_id__volatile, simple_struct_type_id);
+ g_once_init_leave (&simple_struct_type_id__once, simple_struct_type_id);
}
- return simple_struct_type_id__volatile;
+ return simple_struct_type_id__once;
}
diff --git a/tests/chainup/bug791785.c-expected b/tests/chainup/bug791785.c-expected
index 887bcbd8c..bfc939151 100644
--- a/tests/chainup/bug791785.c-expected
+++ b/tests/chainup/bug791785.c-expected
@@ -134,13 +134,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
AbstractBar*
@@ -326,13 +326,13 @@ abstract_bar_get_type_once (void)
GType
abstract_bar_get_type (void)
{
- static volatile gsize abstract_bar_type_id__volatile = 0;
- if (g_once_init_enter (&abstract_bar_type_id__volatile)) {
+ static volatile gsize abstract_bar_type_id__once = 0;
+ if (g_once_init_enter (&abstract_bar_type_id__once)) {
GType abstract_bar_type_id;
abstract_bar_type_id = abstract_bar_get_type_once ();
- g_once_init_leave (&abstract_bar_type_id__volatile, abstract_bar_type_id);
+ g_once_init_leave (&abstract_bar_type_id__once, abstract_bar_type_id);
}
- return abstract_bar_type_id__volatile;
+ return abstract_bar_type_id__once;
}
gpointer
@@ -398,13 +398,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/class-base-foo.c-expected b/tests/chainup/class-base-foo.c-expected
index e75541cec..54766f06d 100644
--- a/tests/chainup/class-base-foo.c-expected
+++ b/tests/chainup/class-base-foo.c-expected
@@ -299,13 +299,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -377,13 +377,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/class-base.c-expected b/tests/chainup/class-base.c-expected
index aae5d4e18..9752d6f66 100644
--- a/tests/chainup/class-base.c-expected
+++ b/tests/chainup/class-base.c-expected
@@ -283,13 +283,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -361,13 +361,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/class-object.c-expected b/tests/chainup/class-object.c-expected
index 64cc773cf..9d95ec4c6 100644
--- a/tests/chainup/class-object.c-expected
+++ b/tests/chainup/class-object.c-expected
@@ -104,13 +104,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/chainup/class-this-foo.c-expected b/tests/chainup/class-this-foo.c-expected
index a8eedf759..3e2de9849 100644
--- a/tests/chainup/class-this-foo.c-expected
+++ b/tests/chainup/class-this-foo.c-expected
@@ -273,13 +273,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/chainup/class-this.c-expected b/tests/chainup/class-this.c-expected
index a430942e8..1fe914c03 100644
--- a/tests/chainup/class-this.c-expected
+++ b/tests/chainup/class-this.c-expected
@@ -273,13 +273,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/chainup/method-lambda-base.c-expected b/tests/chainup/method-lambda-base.c-expected
index ac475e075..cfc1a553f 100644
--- a/tests/chainup/method-lambda-base.c-expected
+++ b/tests/chainup/method-lambda-base.c-expected
@@ -309,13 +309,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -407,13 +407,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/no-chainup.c-expected b/tests/chainup/no-chainup.c-expected
index b756a702e..1791f5084 100644
--- a/tests/chainup/no-chainup.c-expected
+++ b/tests/chainup/no-chainup.c-expected
@@ -320,13 +320,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -382,13 +382,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/signal-default-handler.c-expected b/tests/chainup/signal-default-handler.c-expected
index 0ce9dc2ad..a4b6f5a75 100644
--- a/tests/chainup/signal-default-handler.c-expected
+++ b/tests/chainup/signal-default-handler.c-expected
@@ -143,13 +143,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -198,13 +198,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/struct-base-foo.c-expected b/tests/chainup/struct-base-foo.c-expected
index 970b3b938..47c39e8d6 100644
--- a/tests/chainup/struct-base-foo.c-expected
+++ b/tests/chainup/struct-base-foo.c-expected
@@ -73,13 +73,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -115,13 +115,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/struct-base.c-expected b/tests/chainup/struct-base.c-expected
index 99f8f9bb6..c9c2fa049 100644
--- a/tests/chainup/struct-base.c-expected
+++ b/tests/chainup/struct-base.c-expected
@@ -73,13 +73,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -115,13 +115,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/chainup/struct-this-foo.c-expected b/tests/chainup/struct-this-foo.c-expected
index 9c2eb3956..cee0a3e9a 100644
--- a/tests/chainup/struct-this-foo.c-expected
+++ b/tests/chainup/struct-this-foo.c-expected
@@ -74,13 +74,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/chainup/struct-this.c-expected b/tests/chainup/struct-this.c-expected
index b7092ea9a..4c8ee3336 100644
--- a/tests/chainup/struct-this.c-expected
+++ b/tests/chainup/struct-this.c-expected
@@ -74,13 +74,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/constants/member-access-enum.c-expected b/tests/constants/member-access-enum.c-expected
index eb2faa69e..9cea27ce8 100644
--- a/tests/constants/member-access-enum.c-expected
+++ b/tests/constants/member-access-enum.c-expected
@@ -95,13 +95,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -290,13 +290,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/constants/member-access.c-expected b/tests/constants/member-access.c-expected
index bede8980a..c120ffd5b 100644
--- a/tests/constants/member-access.c-expected
+++ b/tests/constants/member-access.c-expected
@@ -111,13 +111,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -309,13 +309,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/control-flow/break.c-expected b/tests/control-flow/break.c-expected
index 12b91b613..a806409b3 100644
--- a/tests/control-flow/break.c-expected
+++ b/tests/control-flow/break.c-expected
@@ -130,12 +130,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/control-flow/bug736774-1.c-expected b/tests/control-flow/bug736774-1.c-expected
index f0bb4f41d..f687209d9 100644
--- a/tests/control-flow/bug736774-1.c-expected
+++ b/tests/control-flow/bug736774-1.c-expected
@@ -109,13 +109,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Foo*
diff --git a/tests/control-flow/bug761267-1.c-expected b/tests/control-flow/bug761267-1.c-expected
index 2bb072f2a..fdf7617e9 100644
--- a/tests/control-flow/bug761267-1.c-expected
+++ b/tests/control-flow/bug761267-1.c-expected
@@ -278,13 +278,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/control-flow/bug761267-2.c-expected b/tests/control-flow/bug761267-2.c-expected
index c3727b922..14476bde5 100644
--- a/tests/control-flow/bug761267-2.c-expected
+++ b/tests/control-flow/bug761267-2.c-expected
@@ -478,13 +478,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/control-flow/coalesce-right-value.c-expected
b/tests/control-flow/coalesce-right-value.c-expected
index e02d16825..85fb39c40 100644
--- a/tests/control-flow/coalesce-right-value.c-expected
+++ b/tests/control-flow/coalesce-right-value.c-expected
@@ -60,13 +60,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gint*
diff --git a/tests/control-flow/expressions-conditional.c-expected
b/tests/control-flow/expressions-conditional.c-expected
index 2e3b5bf48..0e026d864 100644
--- a/tests/control-flow/expressions-conditional.c-expected
+++ b/tests/control-flow/expressions-conditional.c-expected
@@ -149,12 +149,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/control-flow/for-switch-continue.c-expected
b/tests/control-flow/for-switch-continue.c-expected
index afe3bf145..b6a5eeafe 100644
--- a/tests/control-flow/for-switch-continue.c-expected
+++ b/tests/control-flow/for-switch-continue.c-expected
@@ -106,13 +106,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
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 e648f1d2a..ea99a1cc2 100644
--- a/tests/control-flow/local-clash-with-implicit-this.c-expected
+++ b/tests/control-flow/local-clash-with-implicit-this.c-expected
@@ -271,13 +271,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/control-flow/null-conditional-bool.c-expected
b/tests/control-flow/null-conditional-bool.c-expected
index 4881898d8..4ab15553a 100644
--- a/tests/control-flow/null-conditional-bool.c-expected
+++ b/tests/control-flow/null-conditional-bool.c-expected
@@ -256,13 +256,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/control-flow/pre-post-increment-property.c-expected
b/tests/control-flow/pre-post-increment-property.c-expected
index f429d3212..96949d224 100644
--- a/tests/control-flow/pre-post-increment-property.c-expected
+++ b/tests/control-flow/pre-post-increment-property.c-expected
@@ -457,13 +457,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/control-flow/sideeffects.c-expected b/tests/control-flow/sideeffects.c-expected
index 0479213c8..81c928fd6 100644
--- a/tests/control-flow/sideeffects.c-expected
+++ b/tests/control-flow/sideeffects.c-expected
@@ -122,13 +122,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/control-flow/switch-enum.c-expected b/tests/control-flow/switch-enum.c-expected
index 42c32764a..fc8507bc4 100644
--- a/tests/control-flow/switch-enum.c-expected
+++ b/tests/control-flow/switch-enum.c-expected
@@ -42,13 +42,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Foo
diff --git a/tests/control-flow/switch.c-expected b/tests/control-flow/switch.c-expected
index 1d35aad73..6e7834d96 100644
--- a/tests/control-flow/switch.c-expected
+++ b/tests/control-flow/switch.c-expected
@@ -203,13 +203,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
static inline gpointer
@@ -356,12 +356,12 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
diff --git a/tests/dbus/arrays_client.c-expected b/tests/dbus/arrays_client.c-expected
index 3ca15671e..b6bc4b0f9 100644
--- a/tests/dbus/arrays_client.c-expected
+++ b/tests/dbus/arrays_client.c-expected
@@ -237,13 +237,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/arrays_server.c-expected b/tests/dbus/arrays_server.c-expected
index f704996c4..e382242dd 100644
--- a/tests/dbus/arrays_server.c-expected
+++ b/tests/dbus/arrays_server.c-expected
@@ -414,13 +414,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/async-bus_client.c-expected b/tests/dbus/async-bus_client.c-expected
index 9d5c3921e..8ad54f27f 100644
--- a/tests/dbus/async-bus_client.c-expected
+++ b/tests/dbus/async-bus_client.c-expected
@@ -138,13 +138,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/async-bus_server.c-expected b/tests/dbus/async-bus_server.c-expected
index b0e4b2f16..f26a33350 100644
--- a/tests/dbus/async-bus_server.c-expected
+++ b/tests/dbus/async-bus_server.c-expected
@@ -165,13 +165,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/async-connection_client.c-expected b/tests/dbus/async-connection_client.c-expected
index 60becc0d0..fba78c3c8 100644
--- a/tests/dbus/async-connection_client.c-expected
+++ b/tests/dbus/async-connection_client.c-expected
@@ -138,13 +138,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/async-connection_server.c-expected b/tests/dbus/async-connection_server.c-expected
index 1dd1ad676..ba0683199 100644
--- a/tests/dbus/async-connection_server.c-expected
+++ b/tests/dbus/async-connection_server.c-expected
@@ -165,13 +165,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/async-errors_client.c-expected b/tests/dbus/async-errors_client.c-expected
index 8d19f169a..955926973 100644
--- a/tests/dbus/async-errors_client.c-expected
+++ b/tests/dbus/async-errors_client.c-expected
@@ -377,13 +377,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/async-errors_server.c-expected b/tests/dbus/async-errors_server.c-expected
index 8498b1edf..aaae816eb 100644
--- a/tests/dbus/async-errors_server.c-expected
+++ b/tests/dbus/async-errors_server.c-expected
@@ -631,13 +631,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/async-no-reply_client.c-expected b/tests/dbus/async-no-reply_client.c-expected
index 2970fe51c..c69a9b321 100644
--- a/tests/dbus/async-no-reply_client.c-expected
+++ b/tests/dbus/async-no-reply_client.c-expected
@@ -317,13 +317,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/async-no-reply_server.c-expected b/tests/dbus/async-no-reply_server.c-expected
index f01b56937..e2e894c60 100644
--- a/tests/dbus/async-no-reply_server.c-expected
+++ b/tests/dbus/async-no-reply_server.c-expected
@@ -428,13 +428,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/async_client.c-expected b/tests/dbus/async_client.c-expected
index 6f008222f..343fff00a 100644
--- a/tests/dbus/async_client.c-expected
+++ b/tests/dbus/async_client.c-expected
@@ -327,13 +327,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/async_server.c-expected b/tests/dbus/async_server.c-expected
index b7085a347..81a1ee80b 100644
--- a/tests/dbus/async_server.c-expected
+++ b/tests/dbus/async_server.c-expected
@@ -507,13 +507,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/basic-types_client.c-expected b/tests/dbus/basic-types_client.c-expected
index a8e4ba234..e91779a44 100644
--- a/tests/dbus/basic-types_client.c-expected
+++ b/tests/dbus/basic-types_client.c-expected
@@ -267,13 +267,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/basic-types_server.c-expected b/tests/dbus/basic-types_server.c-expected
index ad21fcde7..dd8f53d52 100644
--- a/tests/dbus/basic-types_server.c-expected
+++ b/tests/dbus/basic-types_server.c-expected
@@ -332,13 +332,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/bug596862.c-expected b/tests/dbus/bug596862.c-expected
index e85b58e66..0d0f81569 100644
--- a/tests/dbus/bug596862.c-expected
+++ b/tests/dbus/bug596862.c-expected
@@ -142,13 +142,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/dbus/bug602003_client.c-expected b/tests/dbus/bug602003_client.c-expected
index 689bdda84..8bb99cf85 100644
--- a/tests/dbus/bug602003_client.c-expected
+++ b/tests/dbus/bug602003_client.c-expected
@@ -139,13 +139,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/bug602003_server.c-expected b/tests/dbus/bug602003_server.c-expected
index b4e2361f7..7fe965ed6 100644
--- a/tests/dbus/bug602003_server.c-expected
+++ b/tests/dbus/bug602003_server.c-expected
@@ -201,13 +201,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/bug735437_client.c-expected b/tests/dbus/bug735437_client.c-expected
index 0d1bf6e9e..faabb245d 100644
--- a/tests/dbus/bug735437_client.c-expected
+++ b/tests/dbus/bug735437_client.c-expected
@@ -206,13 +206,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/bug735437_server.c-expected b/tests/dbus/bug735437_server.c-expected
index 6d6a4c792..82e199e41 100644
--- a/tests/dbus/bug735437_server.c-expected
+++ b/tests/dbus/bug735437_server.c-expected
@@ -283,13 +283,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/bug782719_client.c-expected b/tests/dbus/bug782719_client.c-expected
index 228927c21..7fcc4b7e1 100644
--- a/tests/dbus/bug782719_client.c-expected
+++ b/tests/dbus/bug782719_client.c-expected
@@ -140,13 +140,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/bug782719_server.c-expected b/tests/dbus/bug782719_server.c-expected
index c83c0e629..970ddcf5d 100644
--- a/tests/dbus/bug782719_server.c-expected
+++ b/tests/dbus/bug782719_server.c-expected
@@ -244,13 +244,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/bug783002_client.c-expected b/tests/dbus/bug783002_client.c-expected
index 796a28395..3c3aedfcd 100644
--- a/tests/dbus/bug783002_client.c-expected
+++ b/tests/dbus/bug783002_client.c-expected
@@ -213,13 +213,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected
index 82fd4d43f..679154f0f 100644
--- a/tests/dbus/bug783002_server.c-expected
+++ b/tests/dbus/bug783002_server.c-expected
@@ -365,13 +365,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/bug792277.c-expected b/tests/dbus/bug792277.c-expected
index f43be7557..df47d4e3d 100644
--- a/tests/dbus/bug792277.c-expected
+++ b/tests/dbus/bug792277.c-expected
@@ -241,13 +241,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (IFooProxy, ifoo_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_IFOO,
ifoo_proxy_ifoo_interface_init) )
@@ -548,13 +548,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/dbus/connection_client.c-expected b/tests/dbus/connection_client.c-expected
index 026ef7bf4..288d9a2cc 100644
--- a/tests/dbus/connection_client.c-expected
+++ b/tests/dbus/connection_client.c-expected
@@ -129,13 +129,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/connection_server.c-expected b/tests/dbus/connection_server.c-expected
index 1f44babeb..561a66db6 100644
--- a/tests/dbus/connection_server.c-expected
+++ b/tests/dbus/connection_server.c-expected
@@ -165,13 +165,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/dicts_client.c-expected b/tests/dbus/dicts_client.c-expected
index f8c01f2bd..382bd9412 100644
--- a/tests/dbus/dicts_client.c-expected
+++ b/tests/dbus/dicts_client.c-expected
@@ -140,13 +140,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/dicts_server.c-expected b/tests/dbus/dicts_server.c-expected
index 5ca0c7f46..1cfde4f70 100644
--- a/tests/dbus/dicts_server.c-expected
+++ b/tests/dbus/dicts_server.c-expected
@@ -322,13 +322,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
@@ -488,13 +488,13 @@ test_interface_bar_get_type_once (void)
GType
test_interface_bar_get_type (void)
{
- static volatile gsize test_interface_bar_type_id__volatile = 0;
- if (g_once_init_enter (&test_interface_bar_type_id__volatile)) {
+ static volatile gsize test_interface_bar_type_id__once = 0;
+ if (g_once_init_enter (&test_interface_bar_type_id__once)) {
GType test_interface_bar_type_id;
test_interface_bar_type_id = test_interface_bar_get_type_once ();
- g_once_init_leave (&test_interface_bar_type_id__volatile, test_interface_bar_type_id);
+ g_once_init_leave (&test_interface_bar_type_id__once, test_interface_bar_type_id);
}
- return test_interface_bar_type_id__volatile;
+ return test_interface_bar_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestInterfaceBarProxy, test_interface_bar_proxy, G_TYPE_DBUS_PROXY, 0,
G_IMPLEMENT_INTERFACE (TEST_INTERFACE_TYPE_BAR, test_interface_bar_proxy_test_interface_bar_interface_init) )
@@ -759,13 +759,13 @@ test_interface_foo_get_type_once (void)
GType
test_interface_foo_get_type (void)
{
- static volatile gsize test_interface_foo_type_id__volatile = 0;
- if (g_once_init_enter (&test_interface_foo_type_id__volatile)) {
+ static volatile gsize test_interface_foo_type_id__once = 0;
+ if (g_once_init_enter (&test_interface_foo_type_id__once)) {
GType test_interface_foo_type_id;
test_interface_foo_type_id = test_interface_foo_get_type_once ();
- g_once_init_leave (&test_interface_foo_type_id__volatile, test_interface_foo_type_id);
+ g_once_init_leave (&test_interface_foo_type_id__once, test_interface_foo_type_id);
}
- return test_interface_foo_type_id__volatile;
+ return test_interface_foo_type_id__once;
}
void
diff --git a/tests/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected
index 3829a0e96..926a5b25d 100644
--- a/tests/dbus/dynamic-method_server.c-expected
+++ b/tests/dbus/dynamic-method_server.c-expected
@@ -183,13 +183,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/enum-string-marshalling.c-expected b/tests/dbus/enum-string-marshalling.c-expected
index 48974d471..45bc09d0b 100644
--- a/tests/dbus/enum-string-marshalling.c-expected
+++ b/tests/dbus/enum-string-marshalling.c-expected
@@ -209,13 +209,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
FooEnum
@@ -355,13 +355,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected
index 912bfd490..f7438c4b3 100644
--- a/tests/dbus/errors_client.c-expected
+++ b/tests/dbus/errors_client.c-expected
@@ -261,13 +261,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected
index 2c44e2df4..3bcdc0c48 100644
--- a/tests/dbus/errors_server.c-expected
+++ b/tests/dbus/errors_server.c-expected
@@ -290,13 +290,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/filedescriptor-async_client.c-expected
b/tests/dbus/filedescriptor-async_client.c-expected
index 180d44249..9d6f2262a 100644
--- a/tests/dbus/filedescriptor-async_client.c-expected
+++ b/tests/dbus/filedescriptor-async_client.c-expected
@@ -244,13 +244,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/filedescriptor-async_server.c-expected
b/tests/dbus/filedescriptor-async_server.c-expected
index 1547eb1c7..5c9aa9720 100644
--- a/tests/dbus/filedescriptor-async_server.c-expected
+++ b/tests/dbus/filedescriptor-async_server.c-expected
@@ -396,13 +396,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/filedescriptor-errors_client.c-expected
b/tests/dbus/filedescriptor-errors_client.c-expected
index 67a5feb38..9b1a49f78 100644
--- a/tests/dbus/filedescriptor-errors_client.c-expected
+++ b/tests/dbus/filedescriptor-errors_client.c-expected
@@ -138,13 +138,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/filedescriptor-errors_server.c-expected
b/tests/dbus/filedescriptor-errors_server.c-expected
index ffebe40d7..23c14621b 100644
--- a/tests/dbus/filedescriptor-errors_server.c-expected
+++ b/tests/dbus/filedescriptor-errors_server.c-expected
@@ -193,13 +193,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/filedescriptor_client.c-expected b/tests/dbus/filedescriptor_client.c-expected
index d61f5fd00..cba90e262 100644
--- a/tests/dbus/filedescriptor_client.c-expected
+++ b/tests/dbus/filedescriptor_client.c-expected
@@ -140,13 +140,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected
index e1af703bd..4ff455497 100644
--- a/tests/dbus/filedescriptor_server.c-expected
+++ b/tests/dbus/filedescriptor_server.c-expected
@@ -287,13 +287,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/generics_client.c-expected b/tests/dbus/generics_client.c-expected
index 9b9fa702f..70ffe3afd 100644
--- a/tests/dbus/generics_client.c-expected
+++ b/tests/dbus/generics_client.c-expected
@@ -136,13 +136,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/generics_server.c-expected b/tests/dbus/generics_server.c-expected
index 69ad1af4f..e7b173f86 100644
--- a/tests/dbus/generics_server.c-expected
+++ b/tests/dbus/generics_server.c-expected
@@ -176,13 +176,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/interface-info_client.c-expected b/tests/dbus/interface-info_client.c-expected
index 9ae2ff2b7..cd56a52eb 100644
--- a/tests/dbus/interface-info_client.c-expected
+++ b/tests/dbus/interface-info_client.c-expected
@@ -124,13 +124,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/interface-info_server.c-expected b/tests/dbus/interface-info_server.c-expected
index 21a0c03c7..a23553fda 100644
--- a/tests/dbus/interface-info_server.c-expected
+++ b/tests/dbus/interface-info_server.c-expected
@@ -158,13 +158,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected
index ffeb1f52b..19b35084b 100644
--- a/tests/dbus/no-reply_client.c-expected
+++ b/tests/dbus/no-reply_client.c-expected
@@ -282,13 +282,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/no-reply_server.c-expected b/tests/dbus/no-reply_server.c-expected
index f582dc193..c1f2584a7 100644
--- a/tests/dbus/no-reply_server.c-expected
+++ b/tests/dbus/no-reply_server.c-expected
@@ -309,13 +309,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/rawvariants_client.c-expected b/tests/dbus/rawvariants_client.c-expected
index 7137822ee..7c595a05d 100644
--- a/tests/dbus/rawvariants_client.c-expected
+++ b/tests/dbus/rawvariants_client.c-expected
@@ -325,13 +325,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
@@ -699,13 +699,13 @@ test_raw_get_type_once (void)
GType
test_raw_get_type (void)
{
- static volatile gsize test_raw_type_id__volatile = 0;
- if (g_once_init_enter (&test_raw_type_id__volatile)) {
+ static volatile gsize test_raw_type_id__once = 0;
+ if (g_once_init_enter (&test_raw_type_id__once)) {
GType test_raw_type_id;
test_raw_type_id = test_raw_get_type_once ();
- g_once_init_leave (&test_raw_type_id__volatile, test_raw_type_id);
+ g_once_init_leave (&test_raw_type_id__once, test_raw_type_id);
}
- return test_raw_type_id__volatile;
+ return test_raw_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestRawProxy, test_raw_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE
(TYPE_TEST_RAW, test_raw_proxy_test_raw_interface_init) )
diff --git a/tests/dbus/rawvariants_server.c-expected b/tests/dbus/rawvariants_server.c-expected
index 10c8c023c..ec24125de 100644
--- a/tests/dbus/rawvariants_server.c-expected
+++ b/tests/dbus/rawvariants_server.c-expected
@@ -372,13 +372,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
@@ -729,13 +729,13 @@ test_raw_get_type_once (void)
GType
test_raw_get_type (void)
{
- static volatile gsize test_raw_type_id__volatile = 0;
- if (g_once_init_enter (&test_raw_type_id__volatile)) {
+ static volatile gsize test_raw_type_id__once = 0;
+ if (g_once_init_enter (&test_raw_type_id__once)) {
GType test_raw_type_id;
test_raw_type_id = test_raw_get_type_once ();
- g_once_init_leave (&test_raw_type_id__volatile, test_raw_type_id);
+ g_once_init_leave (&test_raw_type_id__once, test_raw_type_id);
}
- return test_raw_type_id__volatile;
+ return test_raw_type_id__once;
}
static void
diff --git a/tests/dbus/signals_client.c-expected b/tests/dbus/signals_client.c-expected
index 0cf155bf5..fa754b055 100644
--- a/tests/dbus/signals_client.c-expected
+++ b/tests/dbus/signals_client.c-expected
@@ -244,13 +244,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/signals_server.c-expected b/tests/dbus/signals_server.c-expected
index d9876992f..9f9c78102 100644
--- a/tests/dbus/signals_server.c-expected
+++ b/tests/dbus/signals_server.c-expected
@@ -242,13 +242,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/dbus/structs_client.c-expected b/tests/dbus/structs_client.c-expected
index 3345df8c2..1e4b031a9 100644
--- a/tests/dbus/structs_client.c-expected
+++ b/tests/dbus/structs_client.c-expected
@@ -194,13 +194,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
void
@@ -266,13 +266,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
G_DEFINE_TYPE_EXTENDED (TestProxy, test_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_TEST,
test_proxy_test_interface_init) )
diff --git a/tests/dbus/structs_server.c-expected b/tests/dbus/structs_server.c-expected
index 0840275f1..c19bcb04e 100644
--- a/tests/dbus/structs_server.c-expected
+++ b/tests/dbus/structs_server.c-expected
@@ -222,13 +222,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
static inline gpointer
@@ -381,13 +381,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/delegates/bug539166.c-expected b/tests/delegates/bug539166.c-expected
index 515da0949..c335a36fe 100644
--- a/tests/delegates/bug539166.c-expected
+++ b/tests/delegates/bug539166.c-expected
@@ -119,13 +119,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/delegates/bug595610.c-expected b/tests/delegates/bug595610.c-expected
index cbc5934c0..898b76b65 100644
--- a/tests/delegates/bug595610.c-expected
+++ b/tests/delegates/bug595610.c-expected
@@ -57,13 +57,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/delegates/bug639751.c-expected b/tests/delegates/bug639751.c-expected
index af1fae477..b0586a6fd 100644
--- a/tests/delegates/bug639751.c-expected
+++ b/tests/delegates/bug639751.c-expected
@@ -64,13 +64,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/delegates/bug659778.c-expected b/tests/delegates/bug659778.c-expected
index 594ab4389..135d5f436 100644
--- a/tests/delegates/bug659778.c-expected
+++ b/tests/delegates/bug659778.c-expected
@@ -226,13 +226,13 @@ test_enum_get_type_once (void)
GType
test_enum_get_type (void)
{
- static volatile gsize test_enum_type_id__volatile = 0;
- if (g_once_init_enter (&test_enum_type_id__volatile)) {
+ static volatile gsize test_enum_type_id__once = 0;
+ if (g_once_init_enter (&test_enum_type_id__once)) {
GType test_enum_type_id;
test_enum_type_id = test_enum_get_type_once ();
- g_once_init_leave (&test_enum_type_id__volatile, test_enum_type_id);
+ g_once_init_leave (&test_enum_type_id__once, test_enum_type_id);
}
- return test_enum_type_id__volatile;
+ return test_enum_type_id__once;
}
static gpointer
@@ -465,13 +465,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/delegates/bug683925.c-expected b/tests/delegates/bug683925.c-expected
index e2767abd1..cc747164a 100644
--- a/tests/delegates/bug683925.c-expected
+++ b/tests/delegates/bug683925.c-expected
@@ -157,13 +157,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/delegates/casting.c-expected b/tests/delegates/casting.c-expected
index 2642e8e86..fe15b7acf 100644
--- a/tests/delegates/casting.c-expected
+++ b/tests/delegates/casting.c-expected
@@ -173,13 +173,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/delegates/compatible.c-expected b/tests/delegates/compatible.c-expected
index 249a05609..b570e9e26 100644
--- a/tests/delegates/compatible.c-expected
+++ b/tests/delegates/compatible.c-expected
@@ -105,13 +105,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -172,13 +172,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/delegates/delegates.c-expected b/tests/delegates/delegates.c-expected
index 849fe3148..0ed5f457a 100644
--- a/tests/delegates/delegates.c-expected
+++ b/tests/delegates/delegates.c-expected
@@ -144,13 +144,13 @@ parameter_enum_get_type_once (void)
GType
parameter_enum_get_type (void)
{
- static volatile gsize parameter_enum_type_id__volatile = 0;
- if (g_once_init_enter (¶meter_enum_type_id__volatile)) {
+ static volatile gsize parameter_enum_type_id__once = 0;
+ if (g_once_init_enter (¶meter_enum_type_id__once)) {
GType parameter_enum_type_id;
parameter_enum_type_id = parameter_enum_get_type_once ();
- g_once_init_leave (¶meter_enum_type_id__volatile, parameter_enum_type_id);
+ g_once_init_leave (¶meter_enum_type_id__once, parameter_enum_type_id);
}
- return parameter_enum_type_id__volatile;
+ return parameter_enum_type_id__once;
}
MamanDelegateStruct*
@@ -179,13 +179,13 @@ maman_delegate_struct_get_type_once (void)
GType
maman_delegate_struct_get_type (void)
{
- static volatile gsize maman_delegate_struct_type_id__volatile = 0;
- if (g_once_init_enter (&maman_delegate_struct_type_id__volatile)) {
+ static volatile gsize maman_delegate_struct_type_id__once = 0;
+ if (g_once_init_enter (&maman_delegate_struct_type_id__once)) {
GType maman_delegate_struct_type_id;
maman_delegate_struct_type_id = maman_delegate_struct_get_type_once ();
- g_once_init_leave (&maman_delegate_struct_type_id__volatile, maman_delegate_struct_type_id);
+ g_once_init_leave (&maman_delegate_struct_type_id__once, maman_delegate_struct_type_id);
}
- return maman_delegate_struct_type_id__volatile;
+ return maman_delegate_struct_type_id__once;
}
void
@@ -219,13 +219,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
static inline gpointer
@@ -582,12 +582,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/delegates/error-pos.c-expected b/tests/delegates/error-pos.c-expected
index 8023b65fc..25e92dc3b 100644
--- a/tests/delegates/error-pos.c-expected
+++ b/tests/delegates/error-pos.c-expected
@@ -323,13 +323,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/delegates/fields-no-target.c-expected b/tests/delegates/fields-no-target.c-expected
index fbc4d09bc..d065ea232 100644
--- a/tests/delegates/fields-no-target.c-expected
+++ b/tests/delegates/fields-no-target.c-expected
@@ -118,13 +118,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -311,13 +311,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/delegates/gclosure-conversion.c-expected b/tests/delegates/gclosure-conversion.c-expected
index 73612283d..991bb6f15 100644
--- a/tests/delegates/gclosure-conversion.c-expected
+++ b/tests/delegates/gclosure-conversion.c-expected
@@ -217,13 +217,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -344,13 +344,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/delegates/lambda-shared-closure.c-expected
b/tests/delegates/lambda-shared-closure.c-expected
index 8d78411ef..7d99502c3 100644
--- a/tests/delegates/lambda-shared-closure.c-expected
+++ b/tests/delegates/lambda-shared-closure.c-expected
@@ -578,13 +578,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/delegates/reference_transfer.c-expected b/tests/delegates/reference_transfer.c-expected
index 91f561c06..9a8d00e42 100644
--- a/tests/delegates/reference_transfer.c-expected
+++ b/tests/delegates/reference_transfer.c-expected
@@ -308,13 +308,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/enums/bug614424.c-expected b/tests/enums/bug614424.c-expected
index 76c94dca9..70268aa83 100644
--- a/tests/enums/bug614424.c-expected
+++ b/tests/enums/bug614424.c-expected
@@ -55,13 +55,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/enums/bug666035.c-expected b/tests/enums/bug666035.c-expected
index 2da915d10..cbc78c93b 100644
--- a/tests/enums/bug666035.c-expected
+++ b/tests/enums/bug666035.c-expected
@@ -64,13 +64,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static GType
@@ -85,13 +85,13 @@ foo_flag_get_type_once (void)
GType
foo_flag_get_type (void)
{
- static volatile gsize foo_flag_type_id__volatile = 0;
- if (g_once_init_enter (&foo_flag_type_id__volatile)) {
+ static volatile gsize foo_flag_type_id__once = 0;
+ if (g_once_init_enter (&foo_flag_type_id__once)) {
GType foo_flag_type_id;
foo_flag_type_id = foo_flag_get_type_once ();
- g_once_init_leave (&foo_flag_type_id__volatile, foo_flag_type_id);
+ g_once_init_leave (&foo_flag_type_id__once, foo_flag_type_id);
}
- return foo_flag_type_id__volatile;
+ return foo_flag_type_id__once;
}
FooStruct*
@@ -120,13 +120,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
FooEnum
diff --git a/tests/enums/bug673879.c-expected b/tests/enums/bug673879.c-expected
index 8547699b9..98853ff12 100644
--- a/tests/enums/bug673879.c-expected
+++ b/tests/enums/bug673879.c-expected
@@ -42,13 +42,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static Test*
diff --git a/tests/enums/bug763831.c-expected b/tests/enums/bug763831.c-expected
index 56d3b52dc..94bdf4ed5 100644
--- a/tests/enums/bug763831.c-expected
+++ b/tests/enums/bug763831.c-expected
@@ -40,13 +40,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GType
@@ -61,13 +61,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/enums/bug780050.c-expected b/tests/enums/bug780050.c-expected
index b5548cda5..a9f1f51e6 100644
--- a/tests/enums/bug780050.c-expected
+++ b/tests/enums/bug780050.c-expected
@@ -37,13 +37,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/enums/enum-boxed.c-expected b/tests/enums/enum-boxed.c-expected
index 61def93cd..56ed9339c 100644
--- a/tests/enums/enum-boxed.c-expected
+++ b/tests/enums/enum-boxed.c-expected
@@ -55,13 +55,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GType
@@ -76,13 +76,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static Foo*
diff --git a/tests/enums/enum_only.c-expected b/tests/enums/enum_only.c-expected
index ba4551b70..9162eace4 100644
--- a/tests/enums/enum_only.c-expected
+++ b/tests/enums/enum_only.c-expected
@@ -35,13 +35,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/enums/enums.c-expected b/tests/enums/enums.c-expected
index 192a3abc1..a6594015b 100644
--- a/tests/enums/enums.c-expected
+++ b/tests/enums/enums.c-expected
@@ -83,13 +83,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
gint
@@ -112,13 +112,13 @@ maman_fooish_get_type_once (void)
GType
maman_fooish_get_type (void)
{
- static volatile gsize maman_fooish_type_id__volatile = 0;
- if (g_once_init_enter (&maman_fooish_type_id__volatile)) {
+ static volatile gsize maman_fooish_type_id__once = 0;
+ if (g_once_init_enter (&maman_fooish_type_id__once)) {
GType maman_fooish_type_id;
maman_fooish_type_id = maman_fooish_get_type_once ();
- g_once_init_leave (&maman_fooish_type_id__volatile, maman_fooish_type_id);
+ g_once_init_leave (&maman_fooish_type_id__once, maman_fooish_type_id);
}
- return maman_fooish_type_id__volatile;
+ return maman_fooish_type_id__once;
}
void
@@ -227,12 +227,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/enums/flags.c-expected b/tests/enums/flags.c-expected
index 0c0966257..d44b84f89 100644
--- a/tests/enums/flags.c-expected
+++ b/tests/enums/flags.c-expected
@@ -41,13 +41,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/enums/from-0-literal.c-expected b/tests/enums/from-0-literal.c-expected
index 22ba1c191..e06f40799 100644
--- a/tests/enums/from-0-literal.c-expected
+++ b/tests/enums/from-0-literal.c-expected
@@ -40,13 +40,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GType
@@ -61,13 +61,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/enums/in-inference.c-expected b/tests/enums/in-inference.c-expected
index 726babc90..c859a0676 100644
--- a/tests/enums/in-inference.c-expected
+++ b/tests/enums/in-inference.c-expected
@@ -41,13 +41,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/enums/switch.c-expected b/tests/enums/switch.c-expected
index 515c62604..91c674d3b 100644
--- a/tests/enums/switch.c-expected
+++ b/tests/enums/switch.c-expected
@@ -36,13 +36,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/enums/unsafe-assignment.c-expected b/tests/enums/unsafe-assignment.c-expected
index 5da9d05a8..ba8ac7084 100644
--- a/tests/enums/unsafe-assignment.c-expected
+++ b/tests/enums/unsafe-assignment.c-expected
@@ -34,13 +34,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/errors/bug567181.c-expected b/tests/errors/bug567181.c-expected
index 16ce1c21a..db3a661b0 100644
--- a/tests/errors/bug567181.c-expected
+++ b/tests/errors/bug567181.c-expected
@@ -131,13 +131,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/errors/bug596228.c-expected b/tests/errors/bug596228.c-expected
index 9a1a17425..11172b49d 100644
--- a/tests/errors/bug596228.c-expected
+++ b/tests/errors/bug596228.c-expected
@@ -69,13 +69,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/errors/bug623049.c-expected b/tests/errors/bug623049.c-expected
index cb1446c05..0dc36ff53 100644
--- a/tests/errors/bug623049.c-expected
+++ b/tests/errors/bug623049.c-expected
@@ -140,13 +140,13 @@ cls_a_get_type_once (void)
GType
cls_a_get_type (void)
{
- static volatile gsize cls_a_type_id__volatile = 0;
- if (g_once_init_enter (&cls_a_type_id__volatile)) {
+ static volatile gsize cls_a_type_id__once = 0;
+ if (g_once_init_enter (&cls_a_type_id__once)) {
GType cls_a_type_id;
cls_a_type_id = cls_a_get_type_once ();
- g_once_init_leave (&cls_a_type_id__volatile, cls_a_type_id);
+ g_once_init_leave (&cls_a_type_id__once, cls_a_type_id);
}
- return cls_a_type_id__volatile;
+ return cls_a_type_id__once;
}
ClsB*
@@ -196,13 +196,13 @@ cls_b_get_type_once (void)
GType
cls_b_get_type (void)
{
- static volatile gsize cls_b_type_id__volatile = 0;
- if (g_once_init_enter (&cls_b_type_id__volatile)) {
+ static volatile gsize cls_b_type_id__once = 0;
+ if (g_once_init_enter (&cls_b_type_id__once)) {
GType cls_b_type_id;
cls_b_type_id = cls_b_get_type_once ();
- g_once_init_leave (&cls_b_type_id__volatile, cls_b_type_id);
+ g_once_init_leave (&cls_b_type_id__once, cls_b_type_id);
}
- return cls_b_type_id__volatile;
+ return cls_b_type_id__once;
}
static void
diff --git a/tests/errors/bug627090.c-expected b/tests/errors/bug627090.c-expected
index 389a07ac6..6ad044d7e 100644
--- a/tests/errors/bug627090.c-expected
+++ b/tests/errors/bug627090.c-expected
@@ -137,13 +137,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/errors/bug762377.c-expected b/tests/errors/bug762377.c-expected
index fdfa10b37..dfb878ef7 100644
--- a/tests/errors/bug762377.c-expected
+++ b/tests/errors/bug762377.c-expected
@@ -140,13 +140,13 @@ foo_output_stream_get_type_once (void)
GType
foo_output_stream_get_type (void)
{
- static volatile gsize foo_output_stream_type_id__volatile = 0;
- if (g_once_init_enter (&foo_output_stream_type_id__volatile)) {
+ static volatile gsize foo_output_stream_type_id__once = 0;
+ if (g_once_init_enter (&foo_output_stream_type_id__once)) {
GType foo_output_stream_type_id;
foo_output_stream_type_id = foo_output_stream_get_type_once ();
- g_once_init_leave (&foo_output_stream_type_id__volatile, foo_output_stream_type_id);
+ g_once_init_leave (&foo_output_stream_type_id__once, foo_output_stream_type_id);
}
- return foo_output_stream_type_id__volatile;
+ return foo_output_stream_type_id__once;
}
static guint8*
diff --git a/tests/errors/errors.c-expected b/tests/errors/errors.c-expected
index 0732f2f54..6294d88ea 100644
--- a/tests/errors/errors.c-expected
+++ b/tests/errors/errors.c-expected
@@ -317,13 +317,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/errors/unhandled.c-expected b/tests/errors/unhandled.c-expected
index 8bcf6bd45..6de43da7c 100644
--- a/tests/errors/unhandled.c-expected
+++ b/tests/errors/unhandled.c-expected
@@ -234,13 +234,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/generics/arrays.c-expected b/tests/generics/arrays.c-expected
index f436fd7a1..157f22f42 100644
--- a/tests/generics/arrays.c-expected
+++ b/tests/generics/arrays.c-expected
@@ -381,13 +381,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/bug640330.c-expected b/tests/generics/bug640330.c-expected
index edcda3bda..0c4e53568 100644
--- a/tests/generics/bug640330.c-expected
+++ b/tests/generics/bug640330.c-expected
@@ -156,13 +156,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -256,13 +256,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/generics/bug694765-2.c-expected b/tests/generics/bug694765-2.c-expected
index 1c43c8932..1cf5dba06 100644
--- a/tests/generics/bug694765-2.c-expected
+++ b/tests/generics/bug694765-2.c-expected
@@ -218,13 +218,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -325,13 +325,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -500,13 +500,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/generics/constructor-chain-up.c-expected b/tests/generics/constructor-chain-up.c-expected
index ef59fb1a7..32a0cef02 100644
--- a/tests/generics/constructor-chain-up.c-expected
+++ b/tests/generics/constructor-chain-up.c-expected
@@ -164,13 +164,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/generics/inference-argument-may-fail.c-expected
b/tests/generics/inference-argument-may-fail.c-expected
index a80cafbc1..f4d91abd6 100644
--- a/tests/generics/inference-argument-may-fail.c-expected
+++ b/tests/generics/inference-argument-may-fail.c-expected
@@ -290,13 +290,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/inference-static-function.c-expected
b/tests/generics/inference-static-function.c-expected
index 2c28dafb0..a268c4b22 100644
--- a/tests/generics/inference-static-function.c-expected
+++ b/tests/generics/inference-static-function.c-expected
@@ -303,13 +303,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/integer-member-access.c-expected b/tests/generics/integer-member-access.c-expected
index 5f73497de..19e803fa4 100644
--- a/tests/generics/integer-member-access.c-expected
+++ b/tests/generics/integer-member-access.c-expected
@@ -304,13 +304,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/member-dup-destroy.c-expected b/tests/generics/member-dup-destroy.c-expected
index a6c85b476..aba13ad02 100644
--- a/tests/generics/member-dup-destroy.c-expected
+++ b/tests/generics/member-dup-destroy.c-expected
@@ -329,13 +329,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/generics/property-gobject-set.c-expected b/tests/generics/property-gobject-set.c-expected
index c485fcfa8..8308f85a8 100644
--- a/tests/generics/property-gobject-set.c-expected
+++ b/tests/generics/property-gobject-set.c-expected
@@ -187,13 +187,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/generics/property-int-cast.c-expected b/tests/generics/property-int-cast.c-expected
index 617757bb2..b2708305a 100644
--- a/tests/generics/property-int-cast.c-expected
+++ b/tests/generics/property-int-cast.c-expected
@@ -314,13 +314,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/reference-transfer.c-expected b/tests/generics/reference-transfer.c-expected
index e0ce785b4..e3818a195 100644
--- a/tests/generics/reference-transfer.c-expected
+++ b/tests/generics/reference-transfer.c-expected
@@ -304,13 +304,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/generics/string-literal-comparison.c-expected
b/tests/generics/string-literal-comparison.c-expected
index 4d456bfbd..4a4222f22 100644
--- a/tests/generics/string-literal-comparison.c-expected
+++ b/tests/generics/string-literal-comparison.c-expected
@@ -290,13 +290,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/generics/type-parameter-properties.c-expected
b/tests/generics/type-parameter-properties.c-expected
index 7d6b6d657..263c957a3 100644
--- a/tests/generics/type-parameter-properties.c-expected
+++ b/tests/generics/type-parameter-properties.c-expected
@@ -193,13 +193,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -311,13 +311,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/generics/type-parameter-property-clash.c-expected
b/tests/generics/type-parameter-property-clash.c-expected
index d1c8e95e5..1f849dfdb 100644
--- a/tests/generics/type-parameter-property-clash.c-expected
+++ b/tests/generics/type-parameter-property-clash.c-expected
@@ -207,13 +207,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -338,13 +338,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/generics/value-pointer-type-access.c-expected
b/tests/generics/value-pointer-type-access.c-expected
index 9b7338d8b..e98d7fa45 100644
--- a/tests/generics/value-pointer-type-access.c-expected
+++ b/tests/generics/value-pointer-type-access.c-expected
@@ -322,13 +322,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -377,13 +377,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/genie/class-abstract.c-expected b/tests/genie/class-abstract.c-expected
index 82ab96ee1..68b860a53 100644
--- a/tests/genie/class-abstract.c-expected
+++ b/tests/genie/class-abstract.c-expected
@@ -330,13 +330,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
@@ -588,13 +588,13 @@ test2_get_type_once (void)
GType
test2_get_type (void)
{
- static volatile gsize test2_type_id__volatile = 0;
- if (g_once_init_enter (&test2_type_id__volatile)) {
+ static volatile gsize test2_type_id__once = 0;
+ if (g_once_init_enter (&test2_type_id__once)) {
GType test2_type_id;
test2_type_id = test2_get_type_once ();
- g_once_init_leave (&test2_type_id__volatile, test2_type_id);
+ g_once_init_leave (&test2_type_id__once, test2_type_id);
}
- return test2_type_id__volatile;
+ return test2_type_id__once;
}
gpointer
diff --git a/tests/genie/class-field.c-expected b/tests/genie/class-field.c-expected
index f591e31f4..18dbc12b5 100644
--- a/tests/genie/class-field.c-expected
+++ b/tests/genie/class-field.c-expected
@@ -299,13 +299,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/genie/class-init.c-expected b/tests/genie/class-init.c-expected
index 236a2301e..b0cf044bb 100644
--- a/tests/genie/class-init.c-expected
+++ b/tests/genie/class-init.c-expected
@@ -153,12 +153,12 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
diff --git a/tests/genie/class-property.c-expected b/tests/genie/class-property.c-expected
index 4f66b3bfa..f936f2f7d 100644
--- a/tests/genie/class-property.c-expected
+++ b/tests/genie/class-property.c-expected
@@ -251,13 +251,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static void
diff --git a/tests/genie/class-signal.c-expected b/tests/genie/class-signal.c-expected
index 6a7be85c1..281b12fdf 100644
--- a/tests/genie/class-signal.c-expected
+++ b/tests/genie/class-signal.c-expected
@@ -345,13 +345,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/genie/class.c-expected b/tests/genie/class.c-expected
index 12591d1d6..f202bc5de 100644
--- a/tests/genie/class.c-expected
+++ b/tests/genie/class.c-expected
@@ -284,13 +284,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/genie/enum-with-keyword-values.c-expected b/tests/genie/enum-with-keyword-values.c-expected
index 53c07c26a..73251008d 100644
--- a/tests/genie/enum-with-keyword-values.c-expected
+++ b/tests/genie/enum-with-keyword-values.c-expected
@@ -71,12 +71,12 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
diff --git a/tests/genie/enum.c-expected b/tests/genie/enum.c-expected
index 6f946842e..4e82a099d 100644
--- a/tests/genie/enum.c-expected
+++ b/tests/genie/enum.c-expected
@@ -59,12 +59,12 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
diff --git a/tests/genie/interface.c-expected b/tests/genie/interface.c-expected
index 6d2565e61..4442c24e8 100644
--- a/tests/genie/interface.c-expected
+++ b/tests/genie/interface.c-expected
@@ -128,13 +128,13 @@ itest_get_type_once (void)
GType
itest_get_type (void)
{
- static volatile gsize itest_type_id__volatile = 0;
- if (g_once_init_enter (&itest_type_id__volatile)) {
+ static volatile gsize itest_type_id__once = 0;
+ if (g_once_init_enter (&itest_type_id__once)) {
GType itest_type_id;
itest_type_id = itest_get_type_once ();
- g_once_init_leave (&itest_type_id__volatile, itest_type_id);
+ g_once_init_leave (&itest_type_id__once, itest_type_id);
}
- return itest_type_id__volatile;
+ return itest_type_id__once;
}
static gboolean
@@ -197,12 +197,12 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
diff --git a/tests/genie/struct-after-class.c-expected b/tests/genie/struct-after-class.c-expected
index 907506622..34119aa30 100644
--- a/tests/genie/struct-after-class.c-expected
+++ b/tests/genie/struct-after-class.c-expected
@@ -305,13 +305,13 @@ testclass_get_type_once (void)
GType
testclass_get_type (void)
{
- static volatile gsize testclass_type_id__volatile = 0;
- if (g_once_init_enter (&testclass_type_id__volatile)) {
+ static volatile gsize testclass_type_id__once = 0;
+ if (g_once_init_enter (&testclass_type_id__once)) {
GType testclass_type_id;
testclass_type_id = testclass_get_type_once ();
- g_once_init_leave (&testclass_type_id__volatile, testclass_type_id);
+ g_once_init_leave (&testclass_type_id__once, testclass_type_id);
}
- return testclass_type_id__volatile;
+ return testclass_type_id__once;
}
gpointer
@@ -389,12 +389,12 @@ test_struct_get_type_once (void)
GType
test_struct_get_type (void)
{
- static volatile gsize test_struct_type_id__volatile = 0;
- if (g_once_init_enter (&test_struct_type_id__volatile)) {
+ static volatile gsize test_struct_type_id__once = 0;
+ if (g_once_init_enter (&test_struct_type_id__once)) {
GType test_struct_type_id;
test_struct_type_id = test_struct_get_type_once ();
- g_once_init_leave (&test_struct_type_id__volatile, test_struct_type_id);
+ g_once_init_leave (&test_struct_type_id__once, test_struct_type_id);
}
- return test_struct_type_id__volatile;
+ return test_struct_type_id__once;
}
diff --git a/tests/genie/struct.c-expected b/tests/genie/struct.c-expected
index c7c367c87..d62aff439 100644
--- a/tests/genie/struct.c-expected
+++ b/tests/genie/struct.c-expected
@@ -115,12 +115,12 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
diff --git a/tests/methods/argument-array-initilizer.c-expected
b/tests/methods/argument-array-initilizer.c-expected
index 60bb9d964..9fb7a9ab0 100644
--- a/tests/methods/argument-array-initilizer.c-expected
+++ b/tests/methods/argument-array-initilizer.c-expected
@@ -100,13 +100,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/argument-named.c-expected b/tests/methods/argument-named.c-expected
index c44c032fa..ae239b7f1 100644
--- a/tests/methods/argument-named.c-expected
+++ b/tests/methods/argument-named.c-expected
@@ -280,13 +280,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/array-length-type.c-expected b/tests/methods/array-length-type.c-expected
index 7b95a9f9d..85f9ab80b 100644
--- a/tests/methods/array-length-type.c-expected
+++ b/tests/methods/array-length-type.c-expected
@@ -269,13 +269,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -784,13 +784,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -1064,13 +1064,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gint*
diff --git a/tests/methods/bug540483.c-expected b/tests/methods/bug540483.c-expected
index 6b07829db..5dc573fbe 100644
--- a/tests/methods/bug540483.c-expected
+++ b/tests/methods/bug540483.c-expected
@@ -229,13 +229,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -452,13 +452,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -530,13 +530,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -738,13 +738,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
gpointer
@@ -816,13 +816,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/methods/bug597426.c-expected b/tests/methods/bug597426.c-expected
index f58cbfae9..f13a81057 100644
--- a/tests/methods/bug597426.c-expected
+++ b/tests/methods/bug597426.c-expected
@@ -91,13 +91,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/methods/bug599892.c-expected b/tests/methods/bug599892.c-expected
index 135864bcf..ea79e50fa 100644
--- a/tests/methods/bug599892.c-expected
+++ b/tests/methods/bug599892.c-expected
@@ -286,13 +286,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/bug613483.c-expected b/tests/methods/bug613483.c-expected
index b06fc22ed..77c03269e 100644
--- a/tests/methods/bug613483.c-expected
+++ b/tests/methods/bug613483.c-expected
@@ -317,13 +317,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/bug626783.c-expected b/tests/methods/bug626783.c-expected
index ea85282da..4038dc962 100644
--- a/tests/methods/bug626783.c-expected
+++ b/tests/methods/bug626783.c-expected
@@ -310,13 +310,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/methods/bug642350.c-expected b/tests/methods/bug642350.c-expected
index d57a21f4d..16773f7c3 100644
--- a/tests/methods/bug642350.c-expected
+++ b/tests/methods/bug642350.c-expected
@@ -141,13 +141,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gchar*
@@ -223,13 +223,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/methods/bug642885.c-expected b/tests/methods/bug642885.c-expected
index 542ffde78..6b093eb1d 100644
--- a/tests/methods/bug642885.c-expected
+++ b/tests/methods/bug642885.c-expected
@@ -197,13 +197,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/methods/bug642899.c-expected b/tests/methods/bug642899.c-expected
index c474cd963..e95bb0f14 100644
--- a/tests/methods/bug642899.c-expected
+++ b/tests/methods/bug642899.c-expected
@@ -345,13 +345,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/bug648320.c-expected b/tests/methods/bug648320.c-expected
index 6a2df7b5c..b33b02fff 100644
--- a/tests/methods/bug648320.c-expected
+++ b/tests/methods/bug648320.c-expected
@@ -156,13 +156,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/methods/bug652098.c-expected b/tests/methods/bug652098.c-expected
index 8a07c5d55..bcb643435 100644
--- a/tests/methods/bug652098.c-expected
+++ b/tests/methods/bug652098.c-expected
@@ -235,13 +235,13 @@ iface1_get_type_once (void)
GType
iface1_get_type (void)
{
- static volatile gsize iface1_type_id__volatile = 0;
- if (g_once_init_enter (&iface1_type_id__volatile)) {
+ static volatile gsize iface1_type_id__once = 0;
+ if (g_once_init_enter (&iface1_type_id__once)) {
GType iface1_type_id;
iface1_type_id = iface1_get_type_once ();
- g_once_init_leave (&iface1_type_id__volatile, iface1_type_id);
+ g_once_init_leave (&iface1_type_id__once, iface1_type_id);
}
- return iface1_type_id__volatile;
+ return iface1_type_id__once;
}
gint
@@ -275,13 +275,13 @@ iface2_get_type_once (void)
GType
iface2_get_type (void)
{
- static volatile gsize iface2_type_id__volatile = 0;
- if (g_once_init_enter (&iface2_type_id__volatile)) {
+ static volatile gsize iface2_type_id__once = 0;
+ if (g_once_init_enter (&iface2_type_id__once)) {
GType iface2_type_id;
iface2_type_id = iface2_get_type_once ();
- g_once_init_leave (&iface2_type_id__volatile, iface2_type_id);
+ g_once_init_leave (&iface2_type_id__once, iface2_type_id);
}
- return iface2_type_id__volatile;
+ return iface2_type_id__once;
}
static gint
@@ -363,13 +363,13 @@ obj1_get_type_once (void)
GType
obj1_get_type (void)
{
- static volatile gsize obj1_type_id__volatile = 0;
- if (g_once_init_enter (&obj1_type_id__volatile)) {
+ static volatile gsize obj1_type_id__once = 0;
+ if (g_once_init_enter (&obj1_type_id__once)) {
GType obj1_type_id;
obj1_type_id = obj1_get_type_once ();
- g_once_init_leave (&obj1_type_id__volatile, obj1_type_id);
+ g_once_init_leave (&obj1_type_id__once, obj1_type_id);
}
- return obj1_type_id__volatile;
+ return obj1_type_id__once;
}
static gint
@@ -451,13 +451,13 @@ obj2_get_type_once (void)
GType
obj2_get_type (void)
{
- static volatile gsize obj2_type_id__volatile = 0;
- if (g_once_init_enter (&obj2_type_id__volatile)) {
+ static volatile gsize obj2_type_id__once = 0;
+ if (g_once_init_enter (&obj2_type_id__once)) {
GType obj2_type_id;
obj2_type_id = obj2_get_type_once ();
- g_once_init_leave (&obj2_type_id__volatile, obj2_type_id);
+ g_once_init_leave (&obj2_type_id__once, obj2_type_id);
}
- return obj2_type_id__volatile;
+ return obj2_type_id__once;
}
gint
@@ -508,13 +508,13 @@ base_get_type_once (void)
GType
base_get_type (void)
{
- static volatile gsize base_type_id__volatile = 0;
- if (g_once_init_enter (&base_type_id__volatile)) {
+ static volatile gsize base_type_id__once = 0;
+ if (g_once_init_enter (&base_type_id__once)) {
GType base_type_id;
base_type_id = base_get_type_once ();
- g_once_init_leave (&base_type_id__volatile, base_type_id);
+ g_once_init_leave (&base_type_id__once, base_type_id);
}
- return base_type_id__volatile;
+ return base_type_id__once;
}
gint
@@ -548,13 +548,13 @@ iface_get_type_once (void)
GType
iface_get_type (void)
{
- static volatile gsize iface_type_id__volatile = 0;
- if (g_once_init_enter (&iface_type_id__volatile)) {
+ static volatile gsize iface_type_id__once = 0;
+ if (g_once_init_enter (&iface_type_id__once)) {
GType iface_type_id;
iface_type_id = iface_get_type_once ();
- g_once_init_leave (&iface_type_id__volatile, iface_type_id);
+ g_once_init_leave (&iface_type_id__once, iface_type_id);
}
- return iface_type_id__volatile;
+ return iface_type_id__once;
}
Concrete*
@@ -606,13 +606,13 @@ concrete_get_type_once (void)
GType
concrete_get_type (void)
{
- static volatile gsize concrete_type_id__volatile = 0;
- if (g_once_init_enter (&concrete_type_id__volatile)) {
+ static volatile gsize concrete_type_id__once = 0;
+ if (g_once_init_enter (&concrete_type_id__once)) {
GType concrete_type_id;
concrete_type_id = concrete_get_type_once ();
- g_once_init_leave (&concrete_type_id__volatile, concrete_type_id);
+ g_once_init_leave (&concrete_type_id__once, concrete_type_id);
}
- return concrete_type_id__volatile;
+ return concrete_type_id__once;
}
static gpointer
diff --git a/tests/methods/bug663210.c-expected b/tests/methods/bug663210.c-expected
index 5dd62fd0d..d248a449f 100644
--- a/tests/methods/bug663210.c-expected
+++ b/tests/methods/bug663210.c-expected
@@ -349,13 +349,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/bug699956.c-expected b/tests/methods/bug699956.c-expected
index b4d6a760e..b8b789c11 100644
--- a/tests/methods/bug699956.c-expected
+++ b/tests/methods/bug699956.c-expected
@@ -276,13 +276,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -344,13 +344,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Foo*
diff --git a/tests/methods/bug710862.c-expected b/tests/methods/bug710862.c-expected
index 497685ff8..a5a54036b 100644
--- a/tests/methods/bug710862.c-expected
+++ b/tests/methods/bug710862.c-expected
@@ -223,13 +223,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/methods/bug726347.c-expected b/tests/methods/bug726347.c-expected
index 54108bbaf..84681feb5 100644
--- a/tests/methods/bug726347.c-expected
+++ b/tests/methods/bug726347.c-expected
@@ -306,13 +306,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/bug736235.c-expected b/tests/methods/bug736235.c-expected
index 8e322ced0..5f65d8936 100644
--- a/tests/methods/bug736235.c-expected
+++ b/tests/methods/bug736235.c-expected
@@ -157,13 +157,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/methods/bug771964.c-expected b/tests/methods/bug771964.c-expected
index 13a74c4e8..74f16bb9a 100644
--- a/tests/methods/bug771964.c-expected
+++ b/tests/methods/bug771964.c-expected
@@ -158,13 +158,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -221,13 +221,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gint
diff --git a/tests/methods/bug774060.c-expected b/tests/methods/bug774060.c-expected
index 28066f5d5..367b76b79 100644
--- a/tests/methods/bug774060.c-expected
+++ b/tests/methods/bug774060.c-expected
@@ -161,13 +161,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
const gchar*
diff --git a/tests/methods/bug791283.c-expected b/tests/methods/bug791283.c-expected
index e83808f75..30d862fdf 100644
--- a/tests/methods/bug791283.c-expected
+++ b/tests/methods/bug791283.c-expected
@@ -291,13 +291,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/closures.c-expected b/tests/methods/closures.c-expected
index 04d0bc022..baafa40d9 100644
--- a/tests/methods/closures.c-expected
+++ b/tests/methods/closures.c-expected
@@ -256,13 +256,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block2Data*
diff --git a/tests/methods/contains.c-expected b/tests/methods/contains.c-expected
index 4bf0648b4..38ce0855d 100644
--- a/tests/methods/contains.c-expected
+++ b/tests/methods/contains.c-expected
@@ -265,13 +265,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/delegate-target.c-expected b/tests/methods/delegate-target.c-expected
index 56300d248..f1c6add6c 100644
--- a/tests/methods/delegate-target.c-expected
+++ b/tests/methods/delegate-target.c-expected
@@ -201,13 +201,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -541,13 +541,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -735,13 +735,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/methods/extern.c-expected b/tests/methods/extern.c-expected
index 8ade4324b..e8877a601 100644
--- a/tests/methods/extern.c-expected
+++ b/tests/methods/extern.c-expected
@@ -256,13 +256,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/methods/generics.c-expected b/tests/methods/generics.c-expected
index 44fb6b31b..9771371aa 100644
--- a/tests/methods/generics.c-expected
+++ b/tests/methods/generics.c-expected
@@ -159,13 +159,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -352,13 +352,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -429,13 +429,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
void
diff --git a/tests/methods/iterator.c-expected b/tests/methods/iterator.c-expected
index 33a565863..9f20bc38a 100644
--- a/tests/methods/iterator.c-expected
+++ b/tests/methods/iterator.c-expected
@@ -727,13 +727,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -980,13 +980,13 @@ foo_iterator_get_type_once (void)
GType
foo_iterator_get_type (void)
{
- static volatile gsize foo_iterator_type_id__volatile = 0;
- if (g_once_init_enter (&foo_iterator_type_id__volatile)) {
+ static volatile gsize foo_iterator_type_id__once = 0;
+ if (g_once_init_enter (&foo_iterator_type_id__once)) {
GType foo_iterator_type_id;
foo_iterator_type_id = foo_iterator_get_type_once ();
- g_once_init_leave (&foo_iterator_type_id__volatile, foo_iterator_type_id);
+ g_once_init_leave (&foo_iterator_type_id__once, foo_iterator_type_id);
}
- return foo_iterator_type_id__volatile;
+ return foo_iterator_type_id__once;
}
gpointer
@@ -1204,13 +1204,13 @@ foo_collection_get_type_once (void)
GType
foo_collection_get_type (void)
{
- static volatile gsize foo_collection_type_id__volatile = 0;
- if (g_once_init_enter (&foo_collection_type_id__volatile)) {
+ static volatile gsize foo_collection_type_id__once = 0;
+ if (g_once_init_enter (&foo_collection_type_id__once)) {
GType foo_collection_type_id;
foo_collection_type_id = foo_collection_get_type_once ();
- g_once_init_leave (&foo_collection_type_id__volatile, foo_collection_type_id);
+ g_once_init_leave (&foo_collection_type_id__once, foo_collection_type_id);
}
- return foo_collection_type_id__volatile;
+ return foo_collection_type_id__once;
}
gpointer
@@ -1445,13 +1445,13 @@ foo_iterator2_get_type_once (void)
GType
foo_iterator2_get_type (void)
{
- static volatile gsize foo_iterator2_type_id__volatile = 0;
- if (g_once_init_enter (&foo_iterator2_type_id__volatile)) {
+ static volatile gsize foo_iterator2_type_id__once = 0;
+ if (g_once_init_enter (&foo_iterator2_type_id__once)) {
GType foo_iterator2_type_id;
foo_iterator2_type_id = foo_iterator2_get_type_once ();
- g_once_init_leave (&foo_iterator2_type_id__volatile, foo_iterator2_type_id);
+ g_once_init_leave (&foo_iterator2_type_id__once, foo_iterator2_type_id);
}
- return foo_iterator2_type_id__volatile;
+ return foo_iterator2_type_id__once;
}
gpointer
@@ -1669,13 +1669,13 @@ foo_collection2_get_type_once (void)
GType
foo_collection2_get_type (void)
{
- static volatile gsize foo_collection2_type_id__volatile = 0;
- if (g_once_init_enter (&foo_collection2_type_id__volatile)) {
+ static volatile gsize foo_collection2_type_id__once = 0;
+ if (g_once_init_enter (&foo_collection2_type_id__once)) {
GType foo_collection2_type_id;
foo_collection2_type_id = foo_collection2_get_type_once ();
- g_once_init_leave (&foo_collection2_type_id__volatile, foo_collection2_type_id);
+ g_once_init_leave (&foo_collection2_type_id__once, foo_collection2_type_id);
}
- return foo_collection2_type_id__volatile;
+ return foo_collection2_type_id__once;
}
gpointer
@@ -1906,13 +1906,13 @@ foo_collection3_get_type_once (void)
GType
foo_collection3_get_type (void)
{
- static volatile gsize foo_collection3_type_id__volatile = 0;
- if (g_once_init_enter (&foo_collection3_type_id__volatile)) {
+ static volatile gsize foo_collection3_type_id__once = 0;
+ if (g_once_init_enter (&foo_collection3_type_id__once)) {
GType foo_collection3_type_id;
foo_collection3_type_id = foo_collection3_get_type_once ();
- g_once_init_leave (&foo_collection3_type_id__volatile, foo_collection3_type_id);
+ g_once_init_leave (&foo_collection3_type_id__once, foo_collection3_type_id);
}
- return foo_collection3_type_id__volatile;
+ return foo_collection3_type_id__once;
}
gpointer
@@ -2197,13 +2197,13 @@ foo_entry4_get_type_once (void)
GType
foo_entry4_get_type (void)
{
- static volatile gsize foo_entry4_type_id__volatile = 0;
- if (g_once_init_enter (&foo_entry4_type_id__volatile)) {
+ static volatile gsize foo_entry4_type_id__once = 0;
+ if (g_once_init_enter (&foo_entry4_type_id__once)) {
GType foo_entry4_type_id;
foo_entry4_type_id = foo_entry4_get_type_once ();
- g_once_init_leave (&foo_entry4_type_id__volatile, foo_entry4_type_id);
+ g_once_init_leave (&foo_entry4_type_id__once, foo_entry4_type_id);
}
- return foo_entry4_type_id__volatile;
+ return foo_entry4_type_id__once;
}
gpointer
@@ -2452,13 +2452,13 @@ foo_iterator4_get_type_once (void)
GType
foo_iterator4_get_type (void)
{
- static volatile gsize foo_iterator4_type_id__volatile = 0;
- if (g_once_init_enter (&foo_iterator4_type_id__volatile)) {
+ static volatile gsize foo_iterator4_type_id__once = 0;
+ if (g_once_init_enter (&foo_iterator4_type_id__once)) {
GType foo_iterator4_type_id;
foo_iterator4_type_id = foo_iterator4_get_type_once ();
- g_once_init_leave (&foo_iterator4_type_id__volatile, foo_iterator4_type_id);
+ g_once_init_leave (&foo_iterator4_type_id__once, foo_iterator4_type_id);
}
- return foo_iterator4_type_id__volatile;
+ return foo_iterator4_type_id__once;
}
gpointer
@@ -2726,13 +2726,13 @@ foo_collection4_get_type_once (void)
GType
foo_collection4_get_type (void)
{
- static volatile gsize foo_collection4_type_id__volatile = 0;
- if (g_once_init_enter (&foo_collection4_type_id__volatile)) {
+ static volatile gsize foo_collection4_type_id__once = 0;
+ if (g_once_init_enter (&foo_collection4_type_id__once)) {
GType foo_collection4_type_id;
foo_collection4_type_id = foo_collection4_get_type_once ();
- g_once_init_leave (&foo_collection4_type_id__volatile, foo_collection4_type_id);
+ g_once_init_leave (&foo_collection4_type_id__once, foo_collection4_type_id);
}
- return foo_collection4_type_id__volatile;
+ return foo_collection4_type_id__once;
}
gpointer
diff --git a/tests/methods/lambda.c-expected b/tests/methods/lambda.c-expected
index 0ca1dc91b..2eaa62642 100644
--- a/tests/methods/lambda.c-expected
+++ b/tests/methods/lambda.c-expected
@@ -216,12 +216,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/methods/nowrapper-interface.c-expected b/tests/methods/nowrapper-interface.c-expected
index ef4002a98..3d4ee34be 100644
--- a/tests/methods/nowrapper-interface.c-expected
+++ b/tests/methods/nowrapper-interface.c-expected
@@ -89,13 +89,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static gint
@@ -157,13 +157,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/methods/parameter-fixed-array-initializer.c-expected
b/tests/methods/parameter-fixed-array-initializer.c-expected
index 8e36be8dc..fdc6d729d 100644
--- a/tests/methods/parameter-fixed-array-initializer.c-expected
+++ b/tests/methods/parameter-fixed-array-initializer.c-expected
@@ -62,13 +62,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
diff --git a/tests/methods/parameter-out-free-on-error.c-expected
b/tests/methods/parameter-out-free-on-error.c-expected
index caa5e4638..db888bd11 100644
--- a/tests/methods/parameter-out-free-on-error.c-expected
+++ b/tests/methods/parameter-out-free-on-error.c-expected
@@ -109,13 +109,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static gpointer
diff --git a/tests/methods/params-array-with-throws.c-expected
b/tests/methods/params-array-with-throws.c-expected
index ab3e1ffd7..a456b3329 100644
--- a/tests/methods/params-array-with-throws.c-expected
+++ b/tests/methods/params-array-with-throws.c-expected
@@ -487,13 +487,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/params-array.c-expected b/tests/methods/params-array.c-expected
index 4ee39af47..00cd25a25 100644
--- a/tests/methods/params-array.c-expected
+++ b/tests/methods/params-array.c-expected
@@ -708,13 +708,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/prepostconditions.c-expected b/tests/methods/prepostconditions.c-expected
index 6371fc544..b99174516 100644
--- a/tests/methods/prepostconditions.c-expected
+++ b/tests/methods/prepostconditions.c-expected
@@ -470,13 +470,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -563,13 +563,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/methods/print-attribute.c-expected b/tests/methods/print-attribute.c-expected
index 303d5825e..bd627c809 100644
--- a/tests/methods/print-attribute.c-expected
+++ b/tests/methods/print-attribute.c-expected
@@ -282,13 +282,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/same-name.c-expected b/tests/methods/same-name.c-expected
index d17da2c2a..e68b4f3d2 100644
--- a/tests/methods/same-name.c-expected
+++ b/tests/methods/same-name.c-expected
@@ -118,13 +118,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static gboolean
@@ -340,13 +340,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/methods/symbolresolution.c-expected b/tests/methods/symbolresolution.c-expected
index 8e2f205d5..301a18c58 100644
--- a/tests/methods/symbolresolution.c-expected
+++ b/tests/methods/symbolresolution.c-expected
@@ -377,13 +377,13 @@ class_get_type_once (void)
GType
class_get_type (void)
{
- static volatile gsize class_type_id__volatile = 0;
- if (g_once_init_enter (&class_type_id__volatile)) {
+ static volatile gsize class_type_id__once = 0;
+ if (g_once_init_enter (&class_type_id__once)) {
GType class_type_id;
class_type_id = class_get_type_once ();
- g_once_init_leave (&class_type_id__volatile, class_type_id);
+ g_once_init_leave (&class_type_id__once, class_type_id);
}
- return class_type_id__volatile;
+ return class_type_id__once;
}
gpointer
diff --git a/tests/methods/varargs-out.c-expected b/tests/methods/varargs-out.c-expected
index ed87a28dc..35e5ef5eb 100644
--- a/tests/methods/varargs-out.c-expected
+++ b/tests/methods/varargs-out.c-expected
@@ -195,13 +195,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/namespace/unique.c-expected b/tests/namespace/unique.c-expected
index 2aecacf17..102796fd0 100644
--- a/tests/namespace/unique.c-expected
+++ b/tests/namespace/unique.c-expected
@@ -255,13 +255,13 @@ g_vala_foo_get_type_once (void)
GType
g_vala_foo_get_type (void)
{
- static volatile gsize g_vala_foo_type_id__volatile = 0;
- if (g_once_init_enter (&g_vala_foo_type_id__volatile)) {
+ static volatile gsize g_vala_foo_type_id__once = 0;
+ if (g_once_init_enter (&g_vala_foo_type_id__once)) {
GType g_vala_foo_type_id;
g_vala_foo_type_id = g_vala_foo_get_type_once ();
- g_once_init_leave (&g_vala_foo_type_id__volatile, g_vala_foo_type_id);
+ g_once_init_leave (&g_vala_foo_type_id__once, g_vala_foo_type_id);
}
- return g_vala_foo_type_id__volatile;
+ return g_vala_foo_type_id__once;
}
gpointer
diff --git a/tests/nullability/member-access-narrowed-instance.c-expected
b/tests/nullability/member-access-narrowed-instance.c-expected
index 7f89e63f7..4f4051bc1 100644
--- a/tests/nullability/member-access-narrowed-instance.c-expected
+++ b/tests/nullability/member-access-narrowed-instance.c-expected
@@ -254,13 +254,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug566909.c-expected b/tests/objects/bug566909.c-expected
index 6a7918347..05ada381f 100644
--- a/tests/objects/bug566909.c-expected
+++ b/tests/objects/bug566909.c-expected
@@ -120,13 +120,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
static Block1Data*
diff --git a/tests/objects/bug588203.c-expected b/tests/objects/bug588203.c-expected
index aaef8da9b..762390cd1 100644
--- a/tests/objects/bug588203.c-expected
+++ b/tests/objects/bug588203.c-expected
@@ -252,13 +252,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug589928.c-expected b/tests/objects/bug589928.c-expected
index 1b488379f..9dcde3e70 100644
--- a/tests/objects/bug589928.c-expected
+++ b/tests/objects/bug589928.c-expected
@@ -312,13 +312,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug593137.c-expected b/tests/objects/bug593137.c-expected
index 612dc0c31..287bc43fa 100644
--- a/tests/objects/bug593137.c-expected
+++ b/tests/objects/bug593137.c-expected
@@ -151,13 +151,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -221,13 +221,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug593260.c-expected b/tests/objects/bug593260.c-expected
index 9abe5e5fd..a0b3fb9c8 100644
--- a/tests/objects/bug593260.c-expected
+++ b/tests/objects/bug593260.c-expected
@@ -267,13 +267,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug596621.c-expected b/tests/objects/bug596621.c-expected
index 298bdfa63..1beebed6c 100644
--- a/tests/objects/bug596621.c-expected
+++ b/tests/objects/bug596621.c-expected
@@ -120,13 +120,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -175,13 +175,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug597155.c-expected b/tests/objects/bug597155.c-expected
index 6db1b3142..e1336728c 100644
--- a/tests/objects/bug597155.c-expected
+++ b/tests/objects/bug597155.c-expected
@@ -110,13 +110,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/objects/bug597161.c-expected b/tests/objects/bug597161.c-expected
index a7913b7b6..958cbda3e 100644
--- a/tests/objects/bug597161.c-expected
+++ b/tests/objects/bug597161.c-expected
@@ -93,13 +93,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug613486.c-expected b/tests/objects/bug613486.c-expected
index 4f8c44a85..ce02c4d4a 100644
--- a/tests/objects/bug613486.c-expected
+++ b/tests/objects/bug613486.c-expected
@@ -313,13 +313,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -381,13 +381,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug620675.c-expected b/tests/objects/bug620675.c-expected
index 599994759..46dd1a3a0 100644
--- a/tests/objects/bug620675.c-expected
+++ b/tests/objects/bug620675.c-expected
@@ -395,13 +395,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -519,13 +519,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gint
diff --git a/tests/objects/bug620706.c-expected b/tests/objects/bug620706.c-expected
index a446fad98..7165a7b62 100644
--- a/tests/objects/bug620706.c-expected
+++ b/tests/objects/bug620706.c-expected
@@ -194,13 +194,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -269,13 +269,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug624594.c-expected b/tests/objects/bug624594.c-expected
index a30b8ce97..ee199a553 100644
--- a/tests/objects/bug624594.c-expected
+++ b/tests/objects/bug624594.c-expected
@@ -148,13 +148,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug626038-2.c-expected b/tests/objects/bug626038-2.c-expected
index b44656d39..9c4f767bf 100644
--- a/tests/objects/bug626038-2.c-expected
+++ b/tests/objects/bug626038-2.c-expected
@@ -400,13 +400,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -666,13 +666,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug626038.c-expected b/tests/objects/bug626038.c-expected
index 5e2835bf4..994cb86ac 100644
--- a/tests/objects/bug626038.c-expected
+++ b/tests/objects/bug626038.c-expected
@@ -250,13 +250,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug628639.c-expected b/tests/objects/bug628639.c-expected
index a7ffe5239..71864fa2e 100644
--- a/tests/objects/bug628639.c-expected
+++ b/tests/objects/bug628639.c-expected
@@ -304,13 +304,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug629593.c-expected b/tests/objects/bug629593.c-expected
index 6fb1e4eca..4f4814f01 100644
--- a/tests/objects/bug629593.c-expected
+++ b/tests/objects/bug629593.c-expected
@@ -345,13 +345,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -582,13 +582,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/bug631267.c-expected b/tests/objects/bug631267.c-expected
index e7333f8fe..7f39c30d0 100644
--- a/tests/objects/bug631267.c-expected
+++ b/tests/objects/bug631267.c-expected
@@ -217,13 +217,13 @@ fobject_get_type_once (void)
GType
fobject_get_type (void)
{
- static volatile gsize fobject_type_id__volatile = 0;
- if (g_once_init_enter (&fobject_type_id__volatile)) {
+ static volatile gsize fobject_type_id__once = 0;
+ if (g_once_init_enter (&fobject_type_id__once)) {
GType fobject_type_id;
fobject_type_id = fobject_get_type_once ();
- g_once_init_leave (&fobject_type_id__volatile, fobject_type_id);
+ g_once_init_leave (&fobject_type_id__once, fobject_type_id);
}
- return fobject_type_id__volatile;
+ return fobject_type_id__once;
}
FStruct*
@@ -252,13 +252,13 @@ fstruct_get_type_once (void)
GType
fstruct_get_type (void)
{
- static volatile gsize fstruct_type_id__volatile = 0;
- if (g_once_init_enter (&fstruct_type_id__volatile)) {
+ static volatile gsize fstruct_type_id__once = 0;
+ if (g_once_init_enter (&fstruct_type_id__once)) {
GType fstruct_type_id;
fstruct_type_id = fstruct_get_type_once ();
- g_once_init_leave (&fstruct_type_id__volatile, fstruct_type_id);
+ g_once_init_leave (&fstruct_type_id__once, fstruct_type_id);
}
- return fstruct_type_id__volatile;
+ return fstruct_type_id__once;
}
static inline gpointer
@@ -539,13 +539,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug634782.c-expected b/tests/objects/bug634782.c-expected
index 0753c7318..9aaf333e7 100644
--- a/tests/objects/bug634782.c-expected
+++ b/tests/objects/bug634782.c-expected
@@ -269,13 +269,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug641828.c-expected b/tests/objects/bug641828.c-expected
index d1cd5fb34..6f5e25d45 100644
--- a/tests/objects/bug641828.c-expected
+++ b/tests/objects/bug641828.c-expected
@@ -132,13 +132,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Foo*
@@ -189,13 +189,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gint
diff --git a/tests/objects/bug642809.c-expected b/tests/objects/bug642809.c-expected
index 1ca3ce361..fe13d4742 100644
--- a/tests/objects/bug642809.c-expected
+++ b/tests/objects/bug642809.c-expected
@@ -130,13 +130,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -187,13 +187,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -252,13 +252,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/bug643711.c-expected b/tests/objects/bug643711.c-expected
index 3c79f7a75..e9d3f9f02 100644
--- a/tests/objects/bug643711.c-expected
+++ b/tests/objects/bug643711.c-expected
@@ -292,13 +292,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -380,13 +380,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/objects/bug644938.c-expected b/tests/objects/bug644938.c-expected
index b39f3bb7e..cc264a45b 100644
--- a/tests/objects/bug644938.c-expected
+++ b/tests/objects/bug644938.c-expected
@@ -181,13 +181,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -286,13 +286,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug646362.c-expected b/tests/objects/bug646362.c-expected
index 886702810..ebe50de6b 100644
--- a/tests/objects/bug646362.c-expected
+++ b/tests/objects/bug646362.c-expected
@@ -176,13 +176,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug646792.c-expected b/tests/objects/bug646792.c-expected
index 89ee77f2f..a2d9bfcec 100644
--- a/tests/objects/bug646792.c-expected
+++ b/tests/objects/bug646792.c-expected
@@ -283,13 +283,13 @@ wrapper_get_type_once (void)
GType
wrapper_get_type (void)
{
- static volatile gsize wrapper_type_id__volatile = 0;
- if (g_once_init_enter (&wrapper_type_id__volatile)) {
+ static volatile gsize wrapper_type_id__once = 0;
+ if (g_once_init_enter (&wrapper_type_id__once)) {
GType wrapper_type_id;
wrapper_type_id = wrapper_get_type_once ();
- g_once_init_leave (&wrapper_type_id__volatile, wrapper_type_id);
+ g_once_init_leave (&wrapper_type_id__once, wrapper_type_id);
}
- return wrapper_type_id__volatile;
+ return wrapper_type_id__once;
}
gpointer
diff --git a/tests/objects/bug653138.c-expected b/tests/objects/bug653138.c-expected
index 895de9abd..eaef9d195 100644
--- a/tests/objects/bug653138.c-expected
+++ b/tests/objects/bug653138.c-expected
@@ -315,13 +315,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug654702.c-expected b/tests/objects/bug654702.c-expected
index 12c0dcfd5..0d0b8a430 100644
--- a/tests/objects/bug654702.c-expected
+++ b/tests/objects/bug654702.c-expected
@@ -166,13 +166,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -262,13 +262,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug663134.c-expected b/tests/objects/bug663134.c-expected
index 6797802cf..945de99f5 100644
--- a/tests/objects/bug663134.c-expected
+++ b/tests/objects/bug663134.c-expected
@@ -390,13 +390,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug667668.c-expected b/tests/objects/bug667668.c-expected
index 1f9ff83bf..dc7a7e538 100644
--- a/tests/objects/bug667668.c-expected
+++ b/tests/objects/bug667668.c-expected
@@ -206,13 +206,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -355,13 +355,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug681356.c-expected b/tests/objects/bug681356.c-expected
index 20113ea63..82fff780e 100644
--- a/tests/objects/bug681356.c-expected
+++ b/tests/objects/bug681356.c-expected
@@ -151,13 +151,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gint
diff --git a/tests/objects/bug695671.c-expected b/tests/objects/bug695671.c-expected
index 2aaa10299..bd8cf1295 100644
--- a/tests/objects/bug695671.c-expected
+++ b/tests/objects/bug695671.c-expected
@@ -97,13 +97,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug702736.c-expected b/tests/objects/bug702736.c-expected
index 7798d7b9a..320686b7a 100644
--- a/tests/objects/bug702736.c-expected
+++ b/tests/objects/bug702736.c-expected
@@ -210,13 +210,13 @@ class_a_get_type_once (void)
GType
class_a_get_type (void)
{
- static volatile gsize class_a_type_id__volatile = 0;
- if (g_once_init_enter (&class_a_type_id__volatile)) {
+ static volatile gsize class_a_type_id__once = 0;
+ if (g_once_init_enter (&class_a_type_id__once)) {
GType class_a_type_id;
class_a_type_id = class_a_get_type_once ();
- g_once_init_leave (&class_a_type_id__volatile, class_a_type_id);
+ g_once_init_leave (&class_a_type_id__once, class_a_type_id);
}
- return class_a_type_id__volatile;
+ return class_a_type_id__once;
}
static void
@@ -286,13 +286,13 @@ class_b_get_type_once (void)
GType
class_b_get_type (void)
{
- static volatile gsize class_b_type_id__volatile = 0;
- if (g_once_init_enter (&class_b_type_id__volatile)) {
+ static volatile gsize class_b_type_id__once = 0;
+ if (g_once_init_enter (&class_b_type_id__once)) {
GType class_b_type_id;
class_b_type_id = class_b_get_type_once ();
- g_once_init_leave (&class_b_type_id__volatile, class_b_type_id);
+ g_once_init_leave (&class_b_type_id__once, class_b_type_id);
}
- return class_b_type_id__volatile;
+ return class_b_type_id__once;
}
static void
@@ -358,13 +358,13 @@ class_c_get_type_once (void)
GType
class_c_get_type (void)
{
- static volatile gsize class_c_type_id__volatile = 0;
- if (g_once_init_enter (&class_c_type_id__volatile)) {
+ static volatile gsize class_c_type_id__once = 0;
+ if (g_once_init_enter (&class_c_type_id__once)) {
GType class_c_type_id;
class_c_type_id = class_c_get_type_once ();
- g_once_init_leave (&class_c_type_id__volatile, class_c_type_id);
+ g_once_init_leave (&class_c_type_id__once, class_c_type_id);
}
- return class_c_type_id__volatile;
+ return class_c_type_id__once;
}
ClassD*
@@ -423,13 +423,13 @@ class_d_get_type_once (void)
GType
class_d_get_type (void)
{
- static volatile gsize class_d_type_id__volatile = 0;
- if (g_once_init_enter (&class_d_type_id__volatile)) {
+ static volatile gsize class_d_type_id__once = 0;
+ if (g_once_init_enter (&class_d_type_id__once)) {
GType class_d_type_id;
class_d_type_id = class_d_get_type_once ();
- g_once_init_leave (&class_d_type_id__volatile, class_d_type_id);
+ g_once_init_leave (&class_d_type_id__once, class_d_type_id);
}
- return class_d_type_id__volatile;
+ return class_d_type_id__once;
}
static void
diff --git a/tests/objects/bug731547.c-expected b/tests/objects/bug731547.c-expected
index a6bfd3aaa..51d6391aa 100644
--- a/tests/objects/bug731547.c-expected
+++ b/tests/objects/bug731547.c-expected
@@ -118,13 +118,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/objects/bug751338.c-expected b/tests/objects/bug751338.c-expected
index a85f1a77f..b03bc708b 100644
--- a/tests/objects/bug751338.c-expected
+++ b/tests/objects/bug751338.c-expected
@@ -202,13 +202,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug758816.c-expected b/tests/objects/bug758816.c-expected
index 8a6813c49..c22e44636 100644
--- a/tests/objects/bug758816.c-expected
+++ b/tests/objects/bug758816.c-expected
@@ -132,13 +132,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -167,13 +167,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static gboolean
@@ -394,13 +394,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Bar*
diff --git a/tests/objects/bug764481.c-expected b/tests/objects/bug764481.c-expected
index 9f6ee4d85..ea66bcc77 100644
--- a/tests/objects/bug764481.c-expected
+++ b/tests/objects/bug764481.c-expected
@@ -245,13 +245,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static inline gpointer
@@ -388,13 +388,13 @@ base_foo_get_type_once (void)
GType
base_foo_get_type (void)
{
- static volatile gsize base_foo_type_id__volatile = 0;
- if (g_once_init_enter (&base_foo_type_id__volatile)) {
+ static volatile gsize base_foo_type_id__once = 0;
+ if (g_once_init_enter (&base_foo_type_id__once)) {
GType base_foo_type_id;
base_foo_type_id = base_foo_get_type_once ();
- g_once_init_leave (&base_foo_type_id__volatile, base_foo_type_id);
+ g_once_init_leave (&base_foo_type_id__once, base_foo_type_id);
}
- return base_foo_type_id__volatile;
+ return base_foo_type_id__once;
}
static void
@@ -552,13 +552,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -671,13 +671,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -790,13 +790,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/objects/bug766739.c-expected b/tests/objects/bug766739.c-expected
index 1d4f4096d..17f4adb52 100644
--- a/tests/objects/bug766739.c-expected
+++ b/tests/objects/bug766739.c-expected
@@ -212,13 +212,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
FooClass*
@@ -406,13 +406,13 @@ fooclass_get_type_once (void)
GType
fooclass_get_type (void)
{
- static volatile gsize fooclass_type_id__volatile = 0;
- if (g_once_init_enter (&fooclass_type_id__volatile)) {
+ static volatile gsize fooclass_type_id__once = 0;
+ if (g_once_init_enter (&fooclass_type_id__once)) {
GType fooclass_type_id;
fooclass_type_id = fooclass_get_type_once ();
- g_once_init_leave (&fooclass_type_id__volatile, fooclass_type_id);
+ g_once_init_leave (&fooclass_type_id__once, fooclass_type_id);
}
- return fooclass_type_id__volatile;
+ return fooclass_type_id__once;
}
gpointer
@@ -777,13 +777,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/bug778632.c-expected b/tests/objects/bug778632.c-expected
index 6477b5790..ef8387d12 100644
--- a/tests/objects/bug778632.c-expected
+++ b/tests/objects/bug778632.c-expected
@@ -171,13 +171,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/objects/bug779219.c-expected b/tests/objects/bug779219.c-expected
index e16787701..1db51a203 100644
--- a/tests/objects/bug779219.c-expected
+++ b/tests/objects/bug779219.c-expected
@@ -144,13 +144,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
Foo*
@@ -210,13 +210,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -286,13 +286,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug779955.c-expected b/tests/objects/bug779955.c-expected
index b7c1aa9b9..43451cbc9 100644
--- a/tests/objects/bug779955.c-expected
+++ b/tests/objects/bug779955.c-expected
@@ -152,13 +152,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/bug783897.c-expected b/tests/objects/bug783897.c-expected
index ada7bc9cb..389f3a547 100644
--- a/tests/objects/bug783897.c-expected
+++ b/tests/objects/bug783897.c-expected
@@ -157,13 +157,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
Bar*
@@ -192,13 +192,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
@@ -467,13 +467,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/bug788964.c-expected b/tests/objects/bug788964.c-expected
index be66fe795..2f2cca4ba 100644
--- a/tests/objects/bug788964.c-expected
+++ b/tests/objects/bug788964.c-expected
@@ -150,13 +150,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -276,13 +276,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/bug795521.c-expected b/tests/objects/bug795521.c-expected
index bf0ed1e47..07a627494 100644
--- a/tests/objects/bug795521.c-expected
+++ b/tests/objects/bug795521.c-expected
@@ -422,13 +422,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/chainup.c-expected b/tests/objects/chainup.c-expected
index a99544e1b..a3d35c3ef 100644
--- a/tests/objects/chainup.c-expected
+++ b/tests/objects/chainup.c-expected
@@ -368,13 +368,13 @@ foo_base_get_type_once (void)
GType
foo_base_get_type (void)
{
- static volatile gsize foo_base_type_id__volatile = 0;
- if (g_once_init_enter (&foo_base_type_id__volatile)) {
+ static volatile gsize foo_base_type_id__once = 0;
+ if (g_once_init_enter (&foo_base_type_id__once)) {
GType foo_base_type_id;
foo_base_type_id = foo_base_get_type_once ();
- g_once_init_leave (&foo_base_type_id__volatile, foo_base_type_id);
+ g_once_init_leave (&foo_base_type_id__once, foo_base_type_id);
}
- return foo_base_type_id__volatile;
+ return foo_base_type_id__once;
}
gpointer
@@ -518,13 +518,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/class-ccode-cprefix.c-expected b/tests/objects/class-ccode-cprefix.c-expected
index 415e71c1f..e2dbcc440 100644
--- a/tests/objects/class-ccode-cprefix.c-expected
+++ b/tests/objects/class-ccode-cprefix.c-expected
@@ -161,13 +161,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Manam*
@@ -354,13 +354,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
gpointer
diff --git a/tests/objects/class-destroysinstance.c-expected b/tests/objects/class-destroysinstance.c-expected
index 96fc1b9b4..4f52cd7f7 100644
--- a/tests/objects/class-destroysinstance.c-expected
+++ b/tests/objects/class-destroysinstance.c-expected
@@ -101,13 +101,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
diff --git a/tests/objects/class-inner-types.c-expected b/tests/objects/class-inner-types.c-expected
index a64d44fc4..110ad6abb 100644
--- a/tests/objects/class-inner-types.c-expected
+++ b/tests/objects/class-inner-types.c-expected
@@ -351,13 +351,13 @@ foo_bar_get_type_once (void)
static GType
foo_bar_get_type (void)
{
- static volatile gsize foo_bar_type_id__volatile = 0;
- if (g_once_init_enter (&foo_bar_type_id__volatile)) {
+ static volatile gsize foo_bar_type_id__once = 0;
+ if (g_once_init_enter (&foo_bar_type_id__once)) {
GType foo_bar_type_id;
foo_bar_type_id = foo_bar_get_type_once ();
- g_once_init_leave (&foo_bar_type_id__volatile, foo_bar_type_id);
+ g_once_init_leave (&foo_bar_type_id__once, foo_bar_type_id);
}
- return foo_bar_type_id__volatile;
+ return foo_bar_type_id__once;
}
static gpointer
@@ -398,13 +398,13 @@ foo_ibar_get_type_once (void)
static GType
foo_ibar_get_type (void)
{
- static volatile gsize foo_ibar_type_id__volatile = 0;
- if (g_once_init_enter (&foo_ibar_type_id__volatile)) {
+ static volatile gsize foo_ibar_type_id__once = 0;
+ if (g_once_init_enter (&foo_ibar_type_id__once)) {
GType foo_ibar_type_id;
foo_ibar_type_id = foo_ibar_get_type_once ();
- g_once_init_leave (&foo_ibar_type_id__volatile, foo_ibar_type_id);
+ g_once_init_leave (&foo_ibar_type_id__once, foo_ibar_type_id);
}
- return foo_ibar_type_id__volatile;
+ return foo_ibar_type_id__once;
}
static void
@@ -577,13 +577,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/class-new-no-override.c-expected b/tests/objects/class-new-no-override.c-expected
index 3952f8096..034158448 100644
--- a/tests/objects/class-new-no-override.c-expected
+++ b/tests/objects/class-new-no-override.c-expected
@@ -116,13 +116,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
gchar*
@@ -184,13 +184,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/class-partial-nested.c-expected b/tests/objects/class-partial-nested.c-expected
index 32b00c14e..c0ddeafd9 100644
--- a/tests/objects/class-partial-nested.c-expected
+++ b/tests/objects/class-partial-nested.c-expected
@@ -409,13 +409,13 @@ manam_foo_bar_baz_get_type_once (void)
GType
manam_foo_bar_baz_get_type (void)
{
- static volatile gsize manam_foo_bar_baz_type_id__volatile = 0;
- if (g_once_init_enter (&manam_foo_bar_baz_type_id__volatile)) {
+ static volatile gsize manam_foo_bar_baz_type_id__once = 0;
+ if (g_once_init_enter (&manam_foo_bar_baz_type_id__once)) {
GType manam_foo_bar_baz_type_id;
manam_foo_bar_baz_type_id = manam_foo_bar_baz_get_type_once ();
- g_once_init_leave (&manam_foo_bar_baz_type_id__volatile, manam_foo_bar_baz_type_id);
+ g_once_init_leave (&manam_foo_bar_baz_type_id__once, manam_foo_bar_baz_type_id);
}
- return manam_foo_bar_baz_type_id__volatile;
+ return manam_foo_bar_baz_type_id__once;
}
gpointer
diff --git a/tests/objects/class-partial.c-expected b/tests/objects/class-partial.c-expected
index ccc2533d7..0b9f77d2f 100644
--- a/tests/objects/class-partial.c-expected
+++ b/tests/objects/class-partial.c-expected
@@ -177,13 +177,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
void
@@ -215,13 +215,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
static void
@@ -543,13 +543,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/class-vfunc-base-access.c-expected
b/tests/objects/class-vfunc-base-access.c-expected
index b8961ce6e..2ad5c9cdf 100644
--- a/tests/objects/class-vfunc-base-access.c-expected
+++ b/tests/objects/class-vfunc-base-access.c-expected
@@ -332,13 +332,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -427,13 +427,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/class_only.c-expected b/tests/objects/class_only.c-expected
index 4fd50dd61..b4e6d87cc 100644
--- a/tests/objects/class_only.c-expected
+++ b/tests/objects/class_only.c-expected
@@ -247,13 +247,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/classes-implicit-implementation.c-expected
b/tests/objects/classes-implicit-implementation.c-expected
index 865f7ca25..7a633d3a2 100644
--- a/tests/objects/classes-implicit-implementation.c-expected
+++ b/tests/objects/classes-implicit-implementation.c-expected
@@ -213,13 +213,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -241,13 +241,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
gint
@@ -299,13 +299,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gint
@@ -356,13 +356,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static gint
@@ -424,13 +424,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Faz*
@@ -491,13 +491,13 @@ faz_get_type_once (void)
GType
faz_get_type (void)
{
- static volatile gsize faz_type_id__volatile = 0;
- if (g_once_init_enter (&faz_type_id__volatile)) {
+ static volatile gsize faz_type_id__once = 0;
+ if (g_once_init_enter (&faz_type_id__once)) {
GType faz_type_id;
faz_type_id = faz_get_type_once ();
- g_once_init_leave (&faz_type_id__volatile, faz_type_id);
+ g_once_init_leave (&faz_type_id__once, faz_type_id);
}
- return faz_type_id__volatile;
+ return faz_type_id__once;
}
static void
diff --git a/tests/objects/classes-interfaces-virtuals.c-expected
b/tests/objects/classes-interfaces-virtuals.c-expected
index 03a625b22..3ff94e87b 100644
--- a/tests/objects/classes-interfaces-virtuals.c-expected
+++ b/tests/objects/classes-interfaces-virtuals.c-expected
@@ -157,13 +157,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
gchar*
@@ -197,13 +197,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
static gint
@@ -298,13 +298,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gint
@@ -357,13 +357,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/classes-interfaces.c-expected b/tests/objects/classes-interfaces.c-expected
index ebe228f54..25068be12 100644
--- a/tests/objects/classes-interfaces.c-expected
+++ b/tests/objects/classes-interfaces.c-expected
@@ -169,13 +169,13 @@ base_get_type_once (void)
GType
base_get_type (void)
{
- static volatile gsize base_type_id__volatile = 0;
- if (g_once_init_enter (&base_type_id__volatile)) {
+ static volatile gsize base_type_id__once = 0;
+ if (g_once_init_enter (&base_type_id__once)) {
GType base_type_id;
base_type_id = base_get_type_once ();
- g_once_init_leave (&base_type_id__volatile, base_type_id);
+ g_once_init_leave (&base_type_id__once, base_type_id);
}
- return base_type_id__volatile;
+ return base_type_id__once;
}
gchar*
@@ -209,13 +209,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
gint
@@ -249,13 +249,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
static gint
@@ -339,13 +339,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/classes.c-expected b/tests/objects/classes.c-expected
index 9aa82b528..afe167367 100644
--- a/tests/objects/classes.c-expected
+++ b/tests/objects/classes.c-expected
@@ -824,13 +824,13 @@ simple_gtype_instanceclass_get_type_once (void)
GType
simple_gtype_instanceclass_get_type (void)
{
- static volatile gsize simple_gtype_instanceclass_type_id__volatile = 0;
- if (g_once_init_enter (&simple_gtype_instanceclass_type_id__volatile)) {
+ static volatile gsize simple_gtype_instanceclass_type_id__once = 0;
+ if (g_once_init_enter (&simple_gtype_instanceclass_type_id__once)) {
GType simple_gtype_instanceclass_type_id;
simple_gtype_instanceclass_type_id = simple_gtype_instanceclass_get_type_once ();
- g_once_init_leave (&simple_gtype_instanceclass_type_id__volatile,
simple_gtype_instanceclass_type_id);
+ g_once_init_leave (&simple_gtype_instanceclass_type_id__once,
simple_gtype_instanceclass_type_id);
}
- return simple_gtype_instanceclass_type_id__volatile;
+ return simple_gtype_instanceclass_type_id__once;
}
gpointer
@@ -892,13 +892,13 @@ derived_gtype_instanceclass_get_type_once (void)
GType
derived_gtype_instanceclass_get_type (void)
{
- static volatile gsize derived_gtype_instanceclass_type_id__volatile = 0;
- if (g_once_init_enter (&derived_gtype_instanceclass_type_id__volatile)) {
+ static volatile gsize derived_gtype_instanceclass_type_id__once = 0;
+ if (g_once_init_enter (&derived_gtype_instanceclass_type_id__once)) {
GType derived_gtype_instanceclass_type_id;
derived_gtype_instanceclass_type_id = derived_gtype_instanceclass_get_type_once ();
- g_once_init_leave (&derived_gtype_instanceclass_type_id__volatile,
derived_gtype_instanceclass_type_id);
+ g_once_init_leave (&derived_gtype_instanceclass_type_id__once,
derived_gtype_instanceclass_type_id);
}
- return derived_gtype_instanceclass_type_id__volatile;
+ return derived_gtype_instanceclass_type_id__once;
}
PublicGTypeInstanceClass*
@@ -1085,13 +1085,13 @@ public_gtype_instanceclass_get_type_once (void)
GType
public_gtype_instanceclass_get_type (void)
{
- static volatile gsize public_gtype_instanceclass_type_id__volatile = 0;
- if (g_once_init_enter (&public_gtype_instanceclass_type_id__volatile)) {
+ static volatile gsize public_gtype_instanceclass_type_id__once = 0;
+ if (g_once_init_enter (&public_gtype_instanceclass_type_id__once)) {
GType public_gtype_instanceclass_type_id;
public_gtype_instanceclass_type_id = public_gtype_instanceclass_get_type_once ();
- g_once_init_leave (&public_gtype_instanceclass_type_id__volatile,
public_gtype_instanceclass_type_id);
+ g_once_init_leave (&public_gtype_instanceclass_type_id__once,
public_gtype_instanceclass_type_id);
}
- return public_gtype_instanceclass_type_id__volatile;
+ return public_gtype_instanceclass_type_id__once;
}
gpointer
@@ -1301,13 +1301,13 @@ gtype_instance_class_with_creation_method_get_type_once (void)
GType
gtype_instance_class_with_creation_method_get_type (void)
{
- static volatile gsize gtype_instance_class_with_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (>ype_instance_class_with_creation_method_type_id__volatile)) {
+ static volatile gsize gtype_instance_class_with_creation_method_type_id__once = 0;
+ if (g_once_init_enter (>ype_instance_class_with_creation_method_type_id__once)) {
GType gtype_instance_class_with_creation_method_type_id;
gtype_instance_class_with_creation_method_type_id =
gtype_instance_class_with_creation_method_get_type_once ();
- g_once_init_leave (>ype_instance_class_with_creation_method_type_id__volatile,
gtype_instance_class_with_creation_method_type_id);
+ g_once_init_leave (>ype_instance_class_with_creation_method_type_id__once,
gtype_instance_class_with_creation_method_type_id);
}
- return gtype_instance_class_with_creation_method_type_id__volatile;
+ return gtype_instance_class_with_creation_method_type_id__once;
}
gpointer
@@ -1531,13 +1531,13 @@ gtype_instance_class_with_named_creation_method_get_type_once (void)
GType
gtype_instance_class_with_named_creation_method_get_type (void)
{
- static volatile gsize gtype_instance_class_with_named_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (>ype_instance_class_with_named_creation_method_type_id__volatile)) {
+ static volatile gsize gtype_instance_class_with_named_creation_method_type_id__once = 0;
+ if (g_once_init_enter (>ype_instance_class_with_named_creation_method_type_id__once)) {
GType gtype_instance_class_with_named_creation_method_type_id;
gtype_instance_class_with_named_creation_method_type_id =
gtype_instance_class_with_named_creation_method_get_type_once ();
- g_once_init_leave (>ype_instance_class_with_named_creation_method_type_id__volatile,
gtype_instance_class_with_named_creation_method_type_id);
+ g_once_init_leave (>ype_instance_class_with_named_creation_method_type_id__once,
gtype_instance_class_with_named_creation_method_type_id);
}
- return gtype_instance_class_with_named_creation_method_type_id__volatile;
+ return gtype_instance_class_with_named_creation_method_type_id__once;
}
gpointer
@@ -1599,13 +1599,13 @@ simple_gobjectclass_get_type_once (void)
GType
simple_gobjectclass_get_type (void)
{
- static volatile gsize simple_gobjectclass_type_id__volatile = 0;
- if (g_once_init_enter (&simple_gobjectclass_type_id__volatile)) {
+ static volatile gsize simple_gobjectclass_type_id__once = 0;
+ if (g_once_init_enter (&simple_gobjectclass_type_id__once)) {
GType simple_gobjectclass_type_id;
simple_gobjectclass_type_id = simple_gobjectclass_get_type_once ();
- g_once_init_leave (&simple_gobjectclass_type_id__volatile, simple_gobjectclass_type_id);
+ g_once_init_leave (&simple_gobjectclass_type_id__once, simple_gobjectclass_type_id);
}
- return simple_gobjectclass_type_id__volatile;
+ return simple_gobjectclass_type_id__once;
}
DerivedGObjectClass*
@@ -1647,13 +1647,13 @@ derived_gobjectclass_get_type_once (void)
GType
derived_gobjectclass_get_type (void)
{
- static volatile gsize derived_gobjectclass_type_id__volatile = 0;
- if (g_once_init_enter (&derived_gobjectclass_type_id__volatile)) {
+ static volatile gsize derived_gobjectclass_type_id__once = 0;
+ if (g_once_init_enter (&derived_gobjectclass_type_id__once)) {
GType derived_gobjectclass_type_id;
derived_gobjectclass_type_id = derived_gobjectclass_get_type_once ();
- g_once_init_leave (&derived_gobjectclass_type_id__volatile, derived_gobjectclass_type_id);
+ g_once_init_leave (&derived_gobjectclass_type_id__once, derived_gobjectclass_type_id);
}
- return derived_gobjectclass_type_id__volatile;
+ return derived_gobjectclass_type_id__once;
}
PublicGObjectClass*
@@ -1695,13 +1695,13 @@ public_gobjectclass_get_type_once (void)
GType
public_gobjectclass_get_type (void)
{
- static volatile gsize public_gobjectclass_type_id__volatile = 0;
- if (g_once_init_enter (&public_gobjectclass_type_id__volatile)) {
+ static volatile gsize public_gobjectclass_type_id__once = 0;
+ if (g_once_init_enter (&public_gobjectclass_type_id__once)) {
GType public_gobjectclass_type_id;
public_gobjectclass_type_id = public_gobjectclass_get_type_once ();
- g_once_init_leave (&public_gobjectclass_type_id__volatile, public_gobjectclass_type_id);
+ g_once_init_leave (&public_gobjectclass_type_id__once, public_gobjectclass_type_id);
}
- return public_gobjectclass_type_id__volatile;
+ return public_gobjectclass_type_id__once;
}
AbstractGObjectClass*
@@ -1737,13 +1737,13 @@ abstract_gobjectclass_get_type_once (void)
GType
abstract_gobjectclass_get_type (void)
{
- static volatile gsize abstract_gobjectclass_type_id__volatile = 0;
- if (g_once_init_enter (&abstract_gobjectclass_type_id__volatile)) {
+ static volatile gsize abstract_gobjectclass_type_id__once = 0;
+ if (g_once_init_enter (&abstract_gobjectclass_type_id__once)) {
GType abstract_gobjectclass_type_id;
abstract_gobjectclass_type_id = abstract_gobjectclass_get_type_once ();
- g_once_init_leave (&abstract_gobjectclass_type_id__volatile, abstract_gobjectclass_type_id);
+ g_once_init_leave (&abstract_gobjectclass_type_id__once, abstract_gobjectclass_type_id);
}
- return abstract_gobjectclass_type_id__volatile;
+ return abstract_gobjectclass_type_id__once;
}
GObjectClassWithCreationMethod*
@@ -1785,13 +1785,13 @@ gobject_class_with_creation_method_get_type_once (void)
GType
gobject_class_with_creation_method_get_type (void)
{
- static volatile gsize gobject_class_with_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (&gobject_class_with_creation_method_type_id__volatile)) {
+ static volatile gsize gobject_class_with_creation_method_type_id__once = 0;
+ if (g_once_init_enter (&gobject_class_with_creation_method_type_id__once)) {
GType gobject_class_with_creation_method_type_id;
gobject_class_with_creation_method_type_id = gobject_class_with_creation_method_get_type_once
();
- g_once_init_leave (&gobject_class_with_creation_method_type_id__volatile,
gobject_class_with_creation_method_type_id);
+ g_once_init_leave (&gobject_class_with_creation_method_type_id__once,
gobject_class_with_creation_method_type_id);
}
- return gobject_class_with_creation_method_type_id__volatile;
+ return gobject_class_with_creation_method_type_id__once;
}
GObjectClassWithNamedCreationMethod*
@@ -1847,13 +1847,13 @@ gobject_class_with_named_creation_method_get_type_once (void)
GType
gobject_class_with_named_creation_method_get_type (void)
{
- static volatile gsize gobject_class_with_named_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (&gobject_class_with_named_creation_method_type_id__volatile)) {
+ static volatile gsize gobject_class_with_named_creation_method_type_id__once = 0;
+ if (g_once_init_enter (&gobject_class_with_named_creation_method_type_id__once)) {
GType gobject_class_with_named_creation_method_type_id;
gobject_class_with_named_creation_method_type_id =
gobject_class_with_named_creation_method_get_type_once ();
- g_once_init_leave (&gobject_class_with_named_creation_method_type_id__volatile,
gobject_class_with_named_creation_method_type_id);
+ g_once_init_leave (&gobject_class_with_named_creation_method_type_id__once,
gobject_class_with_named_creation_method_type_id);
}
- return gobject_class_with_named_creation_method_type_id__volatile;
+ return gobject_class_with_named_creation_method_type_id__once;
}
static void
diff --git a/tests/objects/compact-class-destructor.c-expected
b/tests/objects/compact-class-destructor.c-expected
index 159804d6b..7214f19d8 100644
--- a/tests/objects/compact-class-destructor.c-expected
+++ b/tests/objects/compact-class-destructor.c-expected
@@ -380,13 +380,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/constructor-inner-error.c-expected
b/tests/objects/constructor-inner-error.c-expected
index 8817ee4e6..702c79511 100644
--- a/tests/objects/constructor-inner-error.c-expected
+++ b/tests/objects/constructor-inner-error.c-expected
@@ -144,13 +144,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/constructor-variadic.c-expected b/tests/objects/constructor-variadic.c-expected
index 475b3d634..522fb8325 100644
--- a/tests/objects/constructor-variadic.c-expected
+++ b/tests/objects/constructor-variadic.c-expected
@@ -308,13 +308,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/constructors.c-expected b/tests/objects/constructors.c-expected
index 1f87c9718..a928d36fa 100644
--- a/tests/objects/constructors.c-expected
+++ b/tests/objects/constructors.c-expected
@@ -247,13 +247,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -345,13 +345,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -414,13 +414,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/destructors.c-expected b/tests/objects/destructors.c-expected
index d71ca00a7..de713d1a2 100644
--- a/tests/objects/destructors.c-expected
+++ b/tests/objects/destructors.c-expected
@@ -211,13 +211,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -305,13 +305,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -383,13 +383,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/dynamic.c-expected b/tests/objects/dynamic.c-expected
index c216564f9..52bbb89bd 100644
--- a/tests/objects/dynamic.c-expected
+++ b/tests/objects/dynamic.c-expected
@@ -218,13 +218,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -326,13 +326,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
diff --git a/tests/objects/fields.c-expected b/tests/objects/fields.c-expected
index 03828580c..c0fdf2f7c 100644
--- a/tests/objects/fields.c-expected
+++ b/tests/objects/fields.c-expected
@@ -501,13 +501,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -767,13 +767,13 @@ faz_get_type_once (void)
GType
faz_get_type (void)
{
- static volatile gsize faz_type_id__volatile = 0;
- if (g_once_init_enter (&faz_type_id__volatile)) {
+ static volatile gsize faz_type_id__once = 0;
+ if (g_once_init_enter (&faz_type_id__once)) {
GType faz_type_id;
faz_type_id = faz_get_type_once ();
- g_once_init_leave (&faz_type_id__volatile, faz_type_id);
+ g_once_init_leave (&faz_type_id__once, faz_type_id);
}
- return faz_type_id__volatile;
+ return faz_type_id__once;
}
Bar*
@@ -826,13 +826,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -1074,13 +1074,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static inline gpointer
@@ -1285,13 +1285,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
gpointer
diff --git a/tests/objects/gobject-class-lifetime.c-expected b/tests/objects/gobject-class-lifetime.c-expected
index 4de1ec2dc..d2c971e12 100644
--- a/tests/objects/gobject-class-lifetime.c-expected
+++ b/tests/objects/gobject-class-lifetime.c-expected
@@ -165,13 +165,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/gtype-class-lifetime.c-expected b/tests/objects/gtype-class-lifetime.c-expected
index 09fd79de5..ce13f2e20 100644
--- a/tests/objects/gtype-class-lifetime.c-expected
+++ b/tests/objects/gtype-class-lifetime.c-expected
@@ -265,13 +265,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/initially-unowned.c-expected b/tests/objects/initially-unowned.c-expected
index 26bfe54ec..3cc673fc0 100644
--- a/tests/objects/initially-unowned.c-expected
+++ b/tests/objects/initially-unowned.c-expected
@@ -162,13 +162,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/instance-comparison.c-expected b/tests/objects/instance-comparison.c-expected
index 9238e1667..d59406b1f 100644
--- a/tests/objects/instance-comparison.c-expected
+++ b/tests/objects/instance-comparison.c-expected
@@ -161,13 +161,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
Bar*
@@ -218,13 +218,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -266,13 +266,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
@@ -295,13 +295,13 @@ ifaz_get_type_once (void)
GType
ifaz_get_type (void)
{
- static volatile gsize ifaz_type_id__volatile = 0;
- if (g_once_init_enter (&ifaz_type_id__volatile)) {
+ static volatile gsize ifaz_type_id__once = 0;
+ if (g_once_init_enter (&ifaz_type_id__once)) {
GType ifaz_type_id;
ifaz_type_id = ifaz_get_type_once ();
- g_once_init_leave (&ifaz_type_id__volatile, ifaz_type_id);
+ g_once_init_leave (&ifaz_type_id__once, ifaz_type_id);
}
- return ifaz_type_id__volatile;
+ return ifaz_type_id__once;
}
Baz*
@@ -361,13 +361,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static gpointer
diff --git a/tests/objects/interface-abstract-async-override.c-expected
b/tests/objects/interface-abstract-async-override.c-expected
index af4f79c49..fb36b0a84 100644
--- a/tests/objects/interface-abstract-async-override.c-expected
+++ b/tests/objects/interface-abstract-async-override.c-expected
@@ -142,13 +142,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -265,13 +265,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/interface-async-base-access.c-expected
b/tests/objects/interface-async-base-access.c-expected
index 57aecbda8..a84c03a39 100644
--- a/tests/objects/interface-async-base-access.c-expected
+++ b/tests/objects/interface-async-base-access.c-expected
@@ -194,13 +194,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -459,13 +459,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -599,13 +599,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/interface-async-captured-generic.c-expected
b/tests/objects/interface-async-captured-generic.c-expected
index 1db37f741..d0d0318ff 100644
--- a/tests/objects/interface-async-captured-generic.c-expected
+++ b/tests/objects/interface-async-captured-generic.c-expected
@@ -189,13 +189,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
Foo*
@@ -267,13 +267,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/interface-base-access.c-expected b/tests/objects/interface-base-access.c-expected
index aef85f1b9..185c70f2d 100644
--- a/tests/objects/interface-base-access.c-expected
+++ b/tests/objects/interface-base-access.c-expected
@@ -145,13 +145,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
@@ -356,13 +356,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -431,13 +431,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/interface-generics.c-expected b/tests/objects/interface-generics.c-expected
index c4ab829be..e9e4491c2 100644
--- a/tests/objects/interface-generics.c-expected
+++ b/tests/objects/interface-generics.c-expected
@@ -120,13 +120,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -210,13 +210,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/interface-inner-types.c-expected b/tests/objects/interface-inner-types.c-expected
index 759d24f72..cb7386ab2 100644
--- a/tests/objects/interface-inner-types.c-expected
+++ b/tests/objects/interface-inner-types.c-expected
@@ -340,13 +340,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -573,13 +573,13 @@ ifoo_bar_get_type_once (void)
static GType
ifoo_bar_get_type (void)
{
- static volatile gsize ifoo_bar_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_bar_type_id__volatile)) {
+ static volatile gsize ifoo_bar_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_bar_type_id__once)) {
GType ifoo_bar_type_id;
ifoo_bar_type_id = ifoo_bar_get_type_once ();
- g_once_init_leave (&ifoo_bar_type_id__volatile, ifoo_bar_type_id);
+ g_once_init_leave (&ifoo_bar_type_id__once, ifoo_bar_type_id);
}
- return ifoo_bar_type_id__volatile;
+ return ifoo_bar_type_id__once;
}
static gpointer
@@ -620,13 +620,13 @@ ifoo_ibar_get_type_once (void)
static GType
ifoo_ibar_get_type (void)
{
- static volatile gsize ifoo_ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_ibar_type_id__volatile)) {
+ static volatile gsize ifoo_ibar_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_ibar_type_id__once)) {
GType ifoo_ibar_type_id;
ifoo_ibar_type_id = ifoo_ibar_get_type_once ();
- g_once_init_leave (&ifoo_ibar_type_id__volatile, ifoo_ibar_type_id);
+ g_once_init_leave (&ifoo_ibar_type_id__once, ifoo_ibar_type_id);
}
- return ifoo_ibar_type_id__volatile;
+ return ifoo_ibar_type_id__once;
}
static void
@@ -647,13 +647,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static void
diff --git a/tests/objects/interface-property-base-access.c-expected
b/tests/objects/interface-property-base-access.c-expected
index acd47da3b..5a7189076 100644
--- a/tests/objects/interface-property-base-access.c-expected
+++ b/tests/objects/interface-property-base-access.c-expected
@@ -173,13 +173,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
const gchar*
@@ -249,13 +249,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -512,13 +512,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -614,13 +614,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gboolean
diff --git a/tests/objects/interface-property-base-impl.c-expected
b/tests/objects/interface-property-base-impl.c-expected
index 02657c92d..9589759d6 100644
--- a/tests/objects/interface-property-base-impl.c-expected
+++ b/tests/objects/interface-property-base-impl.c-expected
@@ -164,13 +164,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -268,13 +268,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -361,13 +361,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/interface-property-delegate.c-expected
b/tests/objects/interface-property-delegate.c-expected
index f4ef3912d..919b29c94 100644
--- a/tests/objects/interface-property-delegate.c-expected
+++ b/tests/objects/interface-property-delegate.c-expected
@@ -193,13 +193,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -437,13 +437,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -677,13 +677,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/interface-property-override.c-expected
b/tests/objects/interface-property-override.c-expected
index d380c2ad8..7059d89e7 100644
--- a/tests/objects/interface-property-override.c-expected
+++ b/tests/objects/interface-property-override.c-expected
@@ -210,13 +210,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
Foo*
@@ -432,13 +432,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -523,13 +523,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
Bar*
@@ -602,13 +602,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/interface-virtual-override.c-expected
b/tests/objects/interface-virtual-override.c-expected
index 626bcb248..46355cc97 100644
--- a/tests/objects/interface-virtual-override.c-expected
+++ b/tests/objects/interface-virtual-override.c-expected
@@ -236,13 +236,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static gint
@@ -364,13 +364,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/interface_only.c-expected b/tests/objects/interface_only.c-expected
index 4dd4bc6bd..ee32d2c56 100644
--- a/tests/objects/interface_only.c-expected
+++ b/tests/objects/interface_only.c-expected
@@ -47,13 +47,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/interfaces.c-expected b/tests/objects/interfaces.c-expected
index a5b7a72f5..7b5ed4f1f 100644
--- a/tests/objects/interfaces.c-expected
+++ b/tests/objects/interfaces.c-expected
@@ -175,13 +175,13 @@ maman_ibaz_get_type_once (void)
GType
maman_ibaz_get_type (void)
{
- static volatile gsize maman_ibaz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_ibaz_type_id__volatile)) {
+ static volatile gsize maman_ibaz_type_id__once = 0;
+ if (g_once_init_enter (&maman_ibaz_type_id__once)) {
GType maman_ibaz_type_id;
maman_ibaz_type_id = maman_ibaz_get_type_once ();
- g_once_init_leave (&maman_ibaz_type_id__volatile, maman_ibaz_type_id);
+ g_once_init_leave (&maman_ibaz_type_id__once, maman_ibaz_type_id);
}
- return maman_ibaz_type_id__volatile;
+ return maman_ibaz_type_id__once;
}
static void
@@ -271,13 +271,13 @@ maman_baz_get_type_once (void)
GType
maman_baz_get_type (void)
{
- static volatile gsize maman_baz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_baz_type_id__volatile)) {
+ static volatile gsize maman_baz_type_id__once = 0;
+ if (g_once_init_enter (&maman_baz_type_id__once)) {
GType maman_baz_type_id;
maman_baz_type_id = maman_baz_get_type_once ();
- g_once_init_leave (&maman_baz_type_id__volatile, maman_baz_type_id);
+ g_once_init_leave (&maman_baz_type_id__once, maman_baz_type_id);
}
- return maman_baz_type_id__volatile;
+ return maman_baz_type_id__once;
}
static void
@@ -367,13 +367,13 @@ maman_sub_baz_get_type_once (void)
GType
maman_sub_baz_get_type (void)
{
- static volatile gsize maman_sub_baz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_sub_baz_type_id__volatile)) {
+ static volatile gsize maman_sub_baz_type_id__once = 0;
+ if (g_once_init_enter (&maman_sub_baz_type_id__once)) {
GType maman_sub_baz_type_id;
maman_sub_baz_type_id = maman_sub_baz_get_type_once ();
- g_once_init_leave (&maman_sub_baz_type_id__volatile, maman_sub_baz_type_id);
+ g_once_init_leave (&maman_sub_baz_type_id__once, maman_sub_baz_type_id);
}
- return maman_sub_baz_type_id__volatile;
+ return maman_sub_baz_type_id__once;
}
static void
diff --git a/tests/objects/member-initializer-base-properties.c-expected
b/tests/objects/member-initializer-base-properties.c-expected
index 78d89f198..859afae4a 100644
--- a/tests/objects/member-initializer-base-properties.c-expected
+++ b/tests/objects/member-initializer-base-properties.c-expected
@@ -173,13 +173,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -426,13 +426,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -575,13 +575,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/member-initializer-chained-2.c-expected
b/tests/objects/member-initializer-chained-2.c-expected
index 4edfc82ba..6ea0aad0c 100644
--- a/tests/objects/member-initializer-chained-2.c-expected
+++ b/tests/objects/member-initializer-chained-2.c-expected
@@ -150,13 +150,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -383,13 +383,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/member-initializer-chained.c-expected
b/tests/objects/member-initializer-chained.c-expected
index b458d8fd0..1ea6a71a5 100644
--- a/tests/objects/member-initializer-chained.c-expected
+++ b/tests/objects/member-initializer-chained.c-expected
@@ -318,13 +318,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -440,13 +440,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gint
diff --git a/tests/objects/member-initializer-property-owned-setter.c-expected
b/tests/objects/member-initializer-property-owned-setter.c-expected
index 4e92d709c..94e126c4b 100644
--- a/tests/objects/member-initializer-property-owned-setter.c-expected
+++ b/tests/objects/member-initializer-property-owned-setter.c-expected
@@ -160,13 +160,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -307,13 +307,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/member-initializer-property.c-expected
b/tests/objects/member-initializer-property.c-expected
index c8ced0af6..8cdaf3e4e 100644
--- a/tests/objects/member-initializer-property.c-expected
+++ b/tests/objects/member-initializer-property.c-expected
@@ -330,13 +330,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
gpointer
@@ -398,13 +398,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -629,13 +629,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/methods.c-expected b/tests/objects/methods.c-expected
index 9cf9e4ed7..ffba0e5f2 100644
--- a/tests/objects/methods.c-expected
+++ b/tests/objects/methods.c-expected
@@ -533,13 +533,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
static void
@@ -746,13 +746,13 @@ maman_sub_bar_get_type_once (void)
GType
maman_sub_bar_get_type (void)
{
- static volatile gsize maman_sub_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_sub_bar_type_id__volatile)) {
+ static volatile gsize maman_sub_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_sub_bar_type_id__once)) {
GType maman_sub_bar_type_id;
maman_sub_bar_type_id = maman_sub_bar_get_type_once ();
- g_once_init_leave (&maman_sub_bar_type_id__volatile, maman_sub_bar_type_id);
+ g_once_init_leave (&maman_sub_bar_type_id__once, maman_sub_bar_type_id);
}
- return maman_sub_bar_type_id__volatile;
+ return maman_sub_bar_type_id__once;
}
void
@@ -781,13 +781,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
void
@@ -838,13 +838,13 @@ maman_foo_bar_get_type_once (void)
GType
maman_foo_bar_get_type (void)
{
- static volatile gsize maman_foo_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_bar_type_id__volatile)) {
+ static volatile gsize maman_foo_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_bar_type_id__once)) {
GType maman_foo_bar_type_id;
maman_foo_bar_type_id = maman_foo_bar_get_type_once ();
- g_once_init_leave (&maman_foo_bar_type_id__volatile, maman_foo_bar_type_id);
+ g_once_init_leave (&maman_foo_bar_type_id__once, maman_foo_bar_type_id);
}
- return maman_foo_bar_type_id__volatile;
+ return maman_foo_bar_type_id__once;
}
MamanSubFooBar*
@@ -895,13 +895,13 @@ maman_sub_foo_bar_get_type_once (void)
GType
maman_sub_foo_bar_get_type (void)
{
- static volatile gsize maman_sub_foo_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_sub_foo_bar_type_id__volatile)) {
+ static volatile gsize maman_sub_foo_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_sub_foo_bar_type_id__once)) {
GType maman_sub_foo_bar_type_id;
maman_sub_foo_bar_type_id = maman_sub_foo_bar_get_type_once ();
- g_once_init_leave (&maman_sub_foo_bar_type_id__volatile, maman_sub_foo_bar_type_id);
+ g_once_init_leave (&maman_sub_foo_bar_type_id__once, maman_sub_foo_bar_type_id);
}
- return maman_sub_foo_bar_type_id__volatile;
+ return maman_sub_foo_bar_type_id__once;
}
static void
@@ -956,13 +956,13 @@ maman_abstract_base_get_type_once (void)
GType
maman_abstract_base_get_type (void)
{
- static volatile gsize maman_abstract_base_type_id__volatile = 0;
- if (g_once_init_enter (&maman_abstract_base_type_id__volatile)) {
+ static volatile gsize maman_abstract_base_type_id__once = 0;
+ if (g_once_init_enter (&maman_abstract_base_type_id__once)) {
GType maman_abstract_base_type_id;
maman_abstract_base_type_id = maman_abstract_base_get_type_once ();
- g_once_init_leave (&maman_abstract_base_type_id__volatile, maman_abstract_base_type_id);
+ g_once_init_leave (&maman_abstract_base_type_id__once, maman_abstract_base_type_id);
}
- return maman_abstract_base_type_id__volatile;
+ return maman_abstract_base_type_id__once;
}
static void
@@ -1006,13 +1006,13 @@ maman_abstract_derived_get_type_once (void)
GType
maman_abstract_derived_get_type (void)
{
- static volatile gsize maman_abstract_derived_type_id__volatile = 0;
- if (g_once_init_enter (&maman_abstract_derived_type_id__volatile)) {
+ static volatile gsize maman_abstract_derived_type_id__once = 0;
+ if (g_once_init_enter (&maman_abstract_derived_type_id__once)) {
GType maman_abstract_derived_type_id;
maman_abstract_derived_type_id = maman_abstract_derived_get_type_once ();
- g_once_init_leave (&maman_abstract_derived_type_id__volatile, maman_abstract_derived_type_id);
+ g_once_init_leave (&maman_abstract_derived_type_id__once, maman_abstract_derived_type_id);
}
- return maman_abstract_derived_type_id__volatile;
+ return maman_abstract_derived_type_id__once;
}
MamanDeepDerived*
@@ -1054,13 +1054,13 @@ maman_deep_derived_get_type_once (void)
GType
maman_deep_derived_get_type (void)
{
- static volatile gsize maman_deep_derived_type_id__volatile = 0;
- if (g_once_init_enter (&maman_deep_derived_type_id__volatile)) {
+ static volatile gsize maman_deep_derived_type_id__once = 0;
+ if (g_once_init_enter (&maman_deep_derived_type_id__once)) {
GType maman_deep_derived_type_id;
maman_deep_derived_type_id = maman_deep_derived_get_type_once ();
- g_once_init_leave (&maman_deep_derived_type_id__volatile, maman_deep_derived_type_id);
+ g_once_init_leave (&maman_deep_derived_type_id__once, maman_deep_derived_type_id);
}
- return maman_deep_derived_type_id__volatile;
+ return maman_deep_derived_type_id__once;
}
gint
@@ -1106,13 +1106,13 @@ maman_base_access_ifoo_get_type_once (void)
GType
maman_base_access_ifoo_get_type (void)
{
- static volatile gsize maman_base_access_ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_base_access_ifoo_type_id__volatile)) {
+ static volatile gsize maman_base_access_ifoo_type_id__once = 0;
+ if (g_once_init_enter (&maman_base_access_ifoo_type_id__once)) {
GType maman_base_access_ifoo_type_id;
maman_base_access_ifoo_type_id = maman_base_access_ifoo_get_type_once ();
- g_once_init_leave (&maman_base_access_ifoo_type_id__volatile, maman_base_access_ifoo_type_id);
+ g_once_init_leave (&maman_base_access_ifoo_type_id__once, maman_base_access_ifoo_type_id);
}
- return maman_base_access_ifoo_type_id__volatile;
+ return maman_base_access_ifoo_type_id__once;
}
static gint
@@ -1217,13 +1217,13 @@ maman_base_access_foo_get_type_once (void)
GType
maman_base_access_foo_get_type (void)
{
- static volatile gsize maman_base_access_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_base_access_foo_type_id__volatile)) {
+ static volatile gsize maman_base_access_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_base_access_foo_type_id__once)) {
GType maman_base_access_foo_type_id;
maman_base_access_foo_type_id = maman_base_access_foo_get_type_once ();
- g_once_init_leave (&maman_base_access_foo_type_id__volatile, maman_base_access_foo_type_id);
+ g_once_init_leave (&maman_base_access_foo_type_id__once, maman_base_access_foo_type_id);
}
- return maman_base_access_foo_type_id__volatile;
+ return maman_base_access_foo_type_id__once;
}
static gint
@@ -1287,13 +1287,13 @@ maman_base_access_bar_get_type_once (void)
GType
maman_base_access_bar_get_type (void)
{
- static volatile gsize maman_base_access_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_base_access_bar_type_id__volatile)) {
+ static volatile gsize maman_base_access_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_base_access_bar_type_id__once)) {
GType maman_base_access_bar_type_id;
maman_base_access_bar_type_id = maman_base_access_bar_get_type_once ();
- g_once_init_leave (&maman_base_access_bar_type_id__volatile, maman_base_access_bar_type_id);
+ g_once_init_leave (&maman_base_access_bar_type_id__once, maman_base_access_bar_type_id);
}
- return maman_base_access_bar_type_id__volatile;
+ return maman_base_access_bar_type_id__once;
}
static gint
@@ -1366,13 +1366,13 @@ maman_base_access_foo_bar_get_type_once (void)
GType
maman_base_access_foo_bar_get_type (void)
{
- static volatile gsize maman_base_access_foo_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_base_access_foo_bar_type_id__volatile)) {
+ static volatile gsize maman_base_access_foo_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_base_access_foo_bar_type_id__once)) {
GType maman_base_access_foo_bar_type_id;
maman_base_access_foo_bar_type_id = maman_base_access_foo_bar_get_type_once ();
- g_once_init_leave (&maman_base_access_foo_bar_type_id__volatile,
maman_base_access_foo_bar_type_id);
+ g_once_init_leave (&maman_base_access_foo_bar_type_id__once,
maman_base_access_foo_bar_type_id);
}
- return maman_base_access_foo_bar_type_id__volatile;
+ return maman_base_access_foo_bar_type_id__once;
}
void
@@ -1689,13 +1689,13 @@ maman_class_test_get_type_once (void)
GType
maman_class_test_get_type (void)
{
- static volatile gsize maman_class_test_type_id__volatile = 0;
- if (g_once_init_enter (&maman_class_test_type_id__volatile)) {
+ static volatile gsize maman_class_test_type_id__once = 0;
+ if (g_once_init_enter (&maman_class_test_type_id__once)) {
GType maman_class_test_type_id;
maman_class_test_type_id = maman_class_test_get_type_once ();
- g_once_init_leave (&maman_class_test_type_id__volatile, maman_class_test_type_id);
+ g_once_init_leave (&maman_class_test_type_id__once, maman_class_test_type_id);
}
- return maman_class_test_type_id__volatile;
+ return maman_class_test_type_id__once;
}
gpointer
diff --git a/tests/objects/paramspec.c-expected b/tests/objects/paramspec.c-expected
index 9185f79ee..da4999822 100644
--- a/tests/objects/paramspec.c-expected
+++ b/tests/objects/paramspec.c-expected
@@ -331,13 +331,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static GType
@@ -352,13 +352,13 @@ foo_flag_get_type_once (void)
GType
foo_flag_get_type (void)
{
- static volatile gsize foo_flag_type_id__volatile = 0;
- if (g_once_init_enter (&foo_flag_type_id__volatile)) {
+ static volatile gsize foo_flag_type_id__once = 0;
+ if (g_once_init_enter (&foo_flag_type_id__once)) {
GType foo_flag_type_id;
foo_flag_type_id = foo_flag_get_type_once ();
- g_once_init_leave (&foo_flag_type_id__volatile, foo_flag_type_id);
+ g_once_init_leave (&foo_flag_type_id__once, foo_flag_type_id);
}
- return foo_flag_type_id__volatile;
+ return foo_flag_type_id__once;
}
FooStruct*
@@ -387,13 +387,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
static inline gpointer
@@ -1574,13 +1574,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/properties.c-expected b/tests/objects/properties.c-expected
index 39dcbc1fa..7e0785610 100644
--- a/tests/objects/properties.c-expected
+++ b/tests/objects/properties.c-expected
@@ -532,13 +532,13 @@ real_struct_get_type_once (void)
GType
real_struct_get_type (void)
{
- static volatile gsize real_struct_type_id__volatile = 0;
- if (g_once_init_enter (&real_struct_type_id__volatile)) {
+ static volatile gsize real_struct_type_id__once = 0;
+ if (g_once_init_enter (&real_struct_type_id__once)) {
GType real_struct_type_id;
real_struct_type_id = real_struct_get_type_once ();
- g_once_init_leave (&real_struct_type_id__volatile, real_struct_type_id);
+ g_once_init_leave (&real_struct_type_id__once, real_struct_type_id);
}
- return real_struct_type_id__volatile;
+ return real_struct_type_id__once;
}
static inline gpointer
@@ -646,13 +646,13 @@ non_priv_access_get_type_once (void)
GType
non_priv_access_get_type (void)
{
- static volatile gsize non_priv_access_type_id__volatile = 0;
- if (g_once_init_enter (&non_priv_access_type_id__volatile)) {
+ static volatile gsize non_priv_access_type_id__once = 0;
+ if (g_once_init_enter (&non_priv_access_type_id__once)) {
GType non_priv_access_type_id;
non_priv_access_type_id = non_priv_access_get_type_once ();
- g_once_init_leave (&non_priv_access_type_id__volatile, non_priv_access_type_id);
+ g_once_init_leave (&non_priv_access_type_id__once, non_priv_access_type_id);
}
- return non_priv_access_type_id__volatile;
+ return non_priv_access_type_id__once;
}
static void
@@ -1058,13 +1058,13 @@ sample_get_type_once (void)
GType
sample_get_type (void)
{
- static volatile gsize sample_type_id__volatile = 0;
- if (g_once_init_enter (&sample_type_id__volatile)) {
+ static volatile gsize sample_type_id__once = 0;
+ if (g_once_init_enter (&sample_type_id__once)) {
GType sample_type_id;
sample_type_id = sample_get_type_once ();
- g_once_init_leave (&sample_type_id__volatile, sample_type_id);
+ g_once_init_leave (&sample_type_id__once, sample_type_id);
}
- return sample_type_id__volatile;
+ return sample_type_id__once;
}
static void
@@ -1216,13 +1216,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
static void
@@ -1273,13 +1273,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
MamanEnumDefault*
@@ -1472,13 +1472,13 @@ maman_enum_default_get_type_once (void)
GType
maman_enum_default_get_type (void)
{
- static volatile gsize maman_enum_default_type_id__volatile = 0;
- if (g_once_init_enter (&maman_enum_default_type_id__volatile)) {
+ static volatile gsize maman_enum_default_type_id__once = 0;
+ if (g_once_init_enter (&maman_enum_default_type_id__once)) {
GType maman_enum_default_type_id;
maman_enum_default_type_id = maman_enum_default_get_type_once ();
- g_once_init_leave (&maman_enum_default_type_id__volatile, maman_enum_default_type_id);
+ g_once_init_leave (&maman_enum_default_type_id__once, maman_enum_default_type_id);
}
- return maman_enum_default_type_id__volatile;
+ return maman_enum_default_type_id__once;
}
gpointer
@@ -1673,13 +1673,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
static void
@@ -1770,13 +1770,13 @@ maman_ibaz_get_type_once (void)
GType
maman_ibaz_get_type (void)
{
- static volatile gsize maman_ibaz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_ibaz_type_id__volatile)) {
+ static volatile gsize maman_ibaz_type_id__once = 0;
+ if (g_once_init_enter (&maman_ibaz_type_id__once)) {
GType maman_ibaz_type_id;
maman_ibaz_type_id = maman_ibaz_get_type_once ();
- g_once_init_leave (&maman_ibaz_type_id__volatile, maman_ibaz_type_id);
+ g_once_init_leave (&maman_ibaz_type_id__once, maman_ibaz_type_id);
}
- return maman_ibaz_type_id__volatile;
+ return maman_ibaz_type_id__once;
}
MamanBaz*
@@ -1840,13 +1840,13 @@ maman_baz_get_type_once (void)
GType
maman_baz_get_type (void)
{
- static volatile gsize maman_baz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_baz_type_id__volatile)) {
+ static volatile gsize maman_baz_type_id__once = 0;
+ if (g_once_init_enter (&maman_baz_type_id__once)) {
GType maman_baz_type_id;
maman_baz_type_id = maman_baz_get_type_once ();
- g_once_init_leave (&maman_baz_type_id__volatile, maman_baz_type_id);
+ g_once_init_leave (&maman_baz_type_id__once, maman_baz_type_id);
}
- return maman_baz_type_id__volatile;
+ return maman_baz_type_id__once;
}
static void
@@ -1911,13 +1911,13 @@ maman_ibiz_get_type_once (void)
GType
maman_ibiz_get_type (void)
{
- static volatile gsize maman_ibiz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_ibiz_type_id__volatile)) {
+ static volatile gsize maman_ibiz_type_id__once = 0;
+ if (g_once_init_enter (&maman_ibiz_type_id__once)) {
GType maman_ibiz_type_id;
maman_ibiz_type_id = maman_ibiz_get_type_once ();
- g_once_init_leave (&maman_ibiz_type_id__volatile, maman_ibiz_type_id);
+ g_once_init_leave (&maman_ibiz_type_id__once, maman_ibiz_type_id);
}
- return maman_ibiz_type_id__volatile;
+ return maman_ibiz_type_id__once;
}
static inline gpointer
@@ -2034,13 +2034,13 @@ maman_abiz_get_type_once (void)
GType
maman_abiz_get_type (void)
{
- static volatile gsize maman_abiz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_abiz_type_id__volatile)) {
+ static volatile gsize maman_abiz_type_id__once = 0;
+ if (g_once_init_enter (&maman_abiz_type_id__once)) {
GType maman_abiz_type_id;
maman_abiz_type_id = maman_abiz_get_type_once ();
- g_once_init_leave (&maman_abiz_type_id__volatile, maman_abiz_type_id);
+ g_once_init_leave (&maman_abiz_type_id__once, maman_abiz_type_id);
}
- return maman_abiz_type_id__volatile;
+ return maman_abiz_type_id__once;
}
static void
@@ -2165,13 +2165,13 @@ maman_biz_get_type_once (void)
GType
maman_biz_get_type (void)
{
- static volatile gsize maman_biz_type_id__volatile = 0;
- if (g_once_init_enter (&maman_biz_type_id__volatile)) {
+ static volatile gsize maman_biz_type_id__once = 0;
+ if (g_once_init_enter (&maman_biz_type_id__once)) {
GType maman_biz_type_id;
maman_biz_type_id = maman_biz_get_type_once ();
- g_once_init_leave (&maman_biz_type_id__volatile, maman_biz_type_id);
+ g_once_init_leave (&maman_biz_type_id__once, maman_biz_type_id);
}
- return maman_biz_type_id__volatile;
+ return maman_biz_type_id__once;
}
static void
diff --git a/tests/objects/property-array.c-expected b/tests/objects/property-array.c-expected
index adaf27722..63f9a1810 100644
--- a/tests/objects/property-array.c-expected
+++ b/tests/objects/property-array.c-expected
@@ -261,13 +261,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static inline gpointer
@@ -855,13 +855,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -1211,13 +1211,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-base-access.c-expected b/tests/objects/property-base-access.c-expected
index 3172a68a3..f36956810 100644
--- a/tests/objects/property-base-access.c-expected
+++ b/tests/objects/property-base-access.c-expected
@@ -332,13 +332,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -456,13 +456,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-construct-only.c-expected
b/tests/objects/property-construct-only.c-expected
index a8fc354cc..a38d8885a 100644
--- a/tests/objects/property-construct-only.c-expected
+++ b/tests/objects/property-construct-only.c-expected
@@ -295,13 +295,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -395,13 +395,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -492,13 +492,13 @@ faz_get_type_once (void)
GType
faz_get_type (void)
{
- static volatile gsize faz_type_id__volatile = 0;
- if (g_once_init_enter (&faz_type_id__volatile)) {
+ static volatile gsize faz_type_id__once = 0;
+ if (g_once_init_enter (&faz_type_id__once)) {
GType faz_type_id;
faz_type_id = faz_get_type_once ();
- g_once_init_leave (&faz_type_id__volatile, faz_type_id);
+ g_once_init_leave (&faz_type_id__once, faz_type_id);
}
- return faz_type_id__volatile;
+ return faz_type_id__once;
}
static void
@@ -576,13 +576,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/objects/property-delegate-owned.c-expected
b/tests/objects/property-delegate-owned.c-expected
index 2c8697c19..cd84a11b7 100644
--- a/tests/objects/property-delegate-owned.c-expected
+++ b/tests/objects/property-delegate-owned.c-expected
@@ -241,13 +241,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
static inline gpointer
@@ -646,13 +646,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -868,13 +868,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-delegate.c-expected b/tests/objects/property-delegate.c-expected
index 9daf7ca06..a4e09b251 100644
--- a/tests/objects/property-delegate.c-expected
+++ b/tests/objects/property-delegate.c-expected
@@ -560,13 +560,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -750,13 +750,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-enum.c-expected b/tests/objects/property-enum.c-expected
index 50c02a146..b46b26cb4 100644
--- a/tests/objects/property-enum.c-expected
+++ b/tests/objects/property-enum.c-expected
@@ -190,13 +190,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static GType
@@ -211,13 +211,13 @@ foo_flag_get_type_once (void)
GType
foo_flag_get_type (void)
{
- static volatile gsize foo_flag_type_id__volatile = 0;
- if (g_once_init_enter (&foo_flag_type_id__volatile)) {
+ static volatile gsize foo_flag_type_id__once = 0;
+ if (g_once_init_enter (&foo_flag_type_id__once)) {
GType foo_flag_type_id;
foo_flag_type_id = foo_flag_get_type_once ();
- g_once_init_leave (&foo_flag_type_id__volatile, foo_flag_type_id);
+ g_once_init_leave (&foo_flag_type_id__once, foo_flag_type_id);
}
- return foo_flag_type_id__volatile;
+ return foo_flag_type_id__once;
}
static inline gpointer
@@ -481,13 +481,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
gpointer
@@ -661,13 +661,13 @@ minim_get_type_once (void)
GType
minim_get_type (void)
{
- static volatile gsize minim_type_id__volatile = 0;
- if (g_once_init_enter (&minim_type_id__volatile)) {
+ static volatile gsize minim_type_id__once = 0;
+ if (g_once_init_enter (&minim_type_id__once)) {
GType minim_type_id;
minim_type_id = minim_get_type_once ();
- g_once_init_leave (&minim_type_id__volatile, minim_type_id);
+ g_once_init_leave (&minim_type_id__once, minim_type_id);
}
- return minim_type_id__volatile;
+ return minim_type_id__once;
}
static void
diff --git a/tests/objects/property-gboxed-nullable.c-expected
b/tests/objects/property-gboxed-nullable.c-expected
index f81eac927..1a3d20edf 100644
--- a/tests/objects/property-gboxed-nullable.c-expected
+++ b/tests/objects/property-gboxed-nullable.c-expected
@@ -185,13 +185,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static inline gpointer
@@ -308,13 +308,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
@@ -448,13 +448,13 @@ faz_get_type_once (void)
GType
faz_get_type (void)
{
- static volatile gsize faz_type_id__volatile = 0;
- if (g_once_init_enter (&faz_type_id__volatile)) {
+ static volatile gsize faz_type_id__once = 0;
+ if (g_once_init_enter (&faz_type_id__once)) {
GType faz_type_id;
faz_type_id = faz_get_type_once ();
- g_once_init_leave (&faz_type_id__volatile, faz_type_id);
+ g_once_init_leave (&faz_type_id__once, faz_type_id);
}
- return faz_type_id__volatile;
+ return faz_type_id__once;
}
static void
diff --git a/tests/objects/property-notify-owned-getter.c-expected
b/tests/objects/property-notify-owned-getter.c-expected
index ee1031f9b..8374c0b2e 100644
--- a/tests/objects/property-notify-owned-getter.c-expected
+++ b/tests/objects/property-notify-owned-getter.c-expected
@@ -200,13 +200,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
@@ -254,13 +254,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static inline gpointer
@@ -614,13 +614,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/property-notify.c-expected b/tests/objects/property-notify.c-expected
index bc7ff100f..093715144 100644
--- a/tests/objects/property-notify.c-expected
+++ b/tests/objects/property-notify.c-expected
@@ -235,13 +235,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/property-ownership.c-expected b/tests/objects/property-ownership.c-expected
index 767ea0e24..8b353c1f5 100644
--- a/tests/objects/property-ownership.c-expected
+++ b/tests/objects/property-ownership.c-expected
@@ -224,13 +224,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -412,13 +412,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -756,13 +756,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
gpointer
diff --git a/tests/objects/property-read-only-auto.c-expected
b/tests/objects/property-read-only-auto.c-expected
index ac3eb981e..18aca57a7 100644
--- a/tests/objects/property-read-only-auto.c-expected
+++ b/tests/objects/property-read-only-auto.c-expected
@@ -381,13 +381,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -479,13 +479,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -538,13 +538,13 @@ ibaz_get_type_once (void)
GType
ibaz_get_type (void)
{
- static volatile gsize ibaz_type_id__volatile = 0;
- if (g_once_init_enter (&ibaz_type_id__volatile)) {
+ static volatile gsize ibaz_type_id__once = 0;
+ if (g_once_init_enter (&ibaz_type_id__once)) {
GType ibaz_type_id;
ibaz_type_id = ibaz_get_type_once ();
- g_once_init_leave (&ibaz_type_id__volatile, ibaz_type_id);
+ g_once_init_leave (&ibaz_type_id__once, ibaz_type_id);
}
- return ibaz_type_id__volatile;
+ return ibaz_type_id__once;
}
static inline gpointer
@@ -627,13 +627,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static void
diff --git a/tests/objects/property-real-struct-assignment.c-expected
b/tests/objects/property-real-struct-assignment.c-expected
index 92a356436..9920fddfd 100644
--- a/tests/objects/property-real-struct-assignment.c-expected
+++ b/tests/objects/property-real-struct-assignment.c-expected
@@ -185,13 +185,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -360,13 +360,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
@@ -597,13 +597,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-simple-type-struct-nullable.c-expected
b/tests/objects/property-simple-type-struct-nullable.c-expected
index dc3d505d4..ebed89e18 100644
--- a/tests/objects/property-simple-type-struct-nullable.c-expected
+++ b/tests/objects/property-simple-type-struct-nullable.c-expected
@@ -167,13 +167,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/property-static.c-expected b/tests/objects/property-static.c-expected
index 0eb0c5771..1d57142f6 100644
--- a/tests/objects/property-static.c-expected
+++ b/tests/objects/property-static.c-expected
@@ -309,13 +309,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -390,13 +390,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/property-struct-no-gtype.c-expected
b/tests/objects/property-struct-no-gtype.c-expected
index d7f7faafd..5c17cf0e8 100644
--- a/tests/objects/property-struct-no-gtype.c-expected
+++ b/tests/objects/property-struct-no-gtype.c-expected
@@ -175,13 +175,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/regex.c-expected b/tests/objects/regex.c-expected
index f64c0349b..3c05606fd 100644
--- a/tests/objects/regex.c-expected
+++ b/tests/objects/regex.c-expected
@@ -215,13 +215,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
static Block1Data*
diff --git a/tests/objects/signals-default-class-handler.c-expected
b/tests/objects/signals-default-class-handler.c-expected
index ebef4b852..55ee90c32 100644
--- a/tests/objects/signals-default-class-handler.c-expected
+++ b/tests/objects/signals-default-class-handler.c-expected
@@ -288,13 +288,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/signals-delegate-parameter.c-expected
b/tests/objects/signals-delegate-parameter.c-expected
index be8df91d9..a2dbe9af0 100644
--- a/tests/objects/signals-delegate-parameter.c-expected
+++ b/tests/objects/signals-delegate-parameter.c-expected
@@ -237,13 +237,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -441,13 +441,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/signals-delegate.c-expected b/tests/objects/signals-delegate.c-expected
index 0c860ee77..ee1bc862a 100644
--- a/tests/objects/signals-delegate.c-expected
+++ b/tests/objects/signals-delegate.c-expected
@@ -289,13 +289,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -443,13 +443,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gchar*
diff --git a/tests/objects/signals-enum-marshal.c-expected b/tests/objects/signals-enum-marshal.c-expected
index 53d57f1e4..4158246a5 100644
--- a/tests/objects/signals-enum-marshal.c-expected
+++ b/tests/objects/signals-enum-marshal.c-expected
@@ -104,13 +104,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GType
@@ -125,13 +125,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -227,13 +227,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/signals-error-marshal.c-expected b/tests/objects/signals-error-marshal.c-expected
index e9d2451ad..35e69052c 100644
--- a/tests/objects/signals-error-marshal.c-expected
+++ b/tests/objects/signals-error-marshal.c-expected
@@ -127,13 +127,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
@@ -256,13 +256,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/signals-fundamental-return.c-expected
b/tests/objects/signals-fundamental-return.c-expected
index f35928fd0..f8bc9c89e 100644
--- a/tests/objects/signals-fundamental-return.c-expected
+++ b/tests/objects/signals-fundamental-return.c-expected
@@ -365,13 +365,13 @@ maman_get_type_once (void)
GType
maman_get_type (void)
{
- static volatile gsize maman_type_id__volatile = 0;
- if (g_once_init_enter (&maman_type_id__volatile)) {
+ static volatile gsize maman_type_id__once = 0;
+ if (g_once_init_enter (&maman_type_id__once)) {
GType maman_type_id;
maman_type_id = maman_get_type_once ();
- g_once_init_leave (&maman_type_id__volatile, maman_type_id);
+ g_once_init_leave (&maman_type_id__once, maman_type_id);
}
- return maman_type_id__volatile;
+ return maman_type_id__once;
}
gpointer
@@ -413,13 +413,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
Bar*
@@ -470,13 +470,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Foo*
@@ -723,13 +723,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/signals-generic-return.c-expected b/tests/objects/signals-generic-return.c-expected
index ab07d7489..0f156d294 100644
--- a/tests/objects/signals-generic-return.c-expected
+++ b/tests/objects/signals-generic-return.c-expected
@@ -219,13 +219,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/objects/signals-gobject-return.c-expected b/tests/objects/signals-gobject-return.c-expected
index b25d17cc9..5a4d8ba8f 100644
--- a/tests/objects/signals-gobject-return.c-expected
+++ b/tests/objects/signals-gobject-return.c-expected
@@ -105,13 +105,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
Foo*
@@ -193,13 +193,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Foo*
diff --git a/tests/objects/signals-lambda-delegate.c-expected
b/tests/objects/signals-lambda-delegate.c-expected
index 0df69f8cc..0e6ba11c2 100644
--- a/tests/objects/signals-lambda-delegate.c-expected
+++ b/tests/objects/signals-lambda-delegate.c-expected
@@ -118,13 +118,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static Block1Data*
diff --git a/tests/objects/signals-prototype-access.c-expected
b/tests/objects/signals-prototype-access.c-expected
index deb2050aa..8c46ef8dd 100644
--- a/tests/objects/signals-prototype-access.c-expected
+++ b/tests/objects/signals-prototype-access.c-expected
@@ -343,13 +343,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/signals-struct-return.c-expected b/tests/objects/signals-struct-return.c-expected
index bc3658882..97d3acb14 100644
--- a/tests/objects/signals-struct-return.c-expected
+++ b/tests/objects/signals-struct-return.c-expected
@@ -160,13 +160,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -296,13 +296,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/objects/signals.c-expected b/tests/objects/signals.c-expected
index f1b0e5356..2bf57024e 100644
--- a/tests/objects/signals.c-expected
+++ b/tests/objects/signals.c-expected
@@ -336,13 +336,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
static void
@@ -498,13 +498,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
void
@@ -584,13 +584,13 @@ maman_user_foo_get_type_once (void)
GType
maman_user_foo_get_type (void)
{
- static volatile gsize maman_user_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_user_foo_type_id__volatile)) {
+ static volatile gsize maman_user_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_user_foo_type_id__once)) {
GType maman_user_foo_type_id;
maman_user_foo_type_id = maman_user_foo_get_type_once ();
- g_once_init_leave (&maman_user_foo_type_id__volatile, maman_user_foo_type_id);
+ g_once_init_leave (&maman_user_foo_type_id__once, maman_user_foo_type_id);
}
- return maman_user_foo_type_id__volatile;
+ return maman_user_foo_type_id__once;
}
static void
@@ -698,13 +698,13 @@ maman_user_bar_get_type_once (void)
GType
maman_user_bar_get_type (void)
{
- static volatile gsize maman_user_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_user_bar_type_id__volatile)) {
+ static volatile gsize maman_user_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_user_bar_type_id__once)) {
GType maman_user_bar_type_id;
maman_user_bar_type_id = maman_user_bar_get_type_once ();
- g_once_init_leave (&maman_user_bar_type_id__volatile, maman_user_bar_type_id);
+ g_once_init_leave (&maman_user_bar_type_id__once, maman_user_bar_type_id);
}
- return maman_user_bar_type_id__volatile;
+ return maman_user_bar_type_id__once;
}
MamanReturnFoo*
@@ -806,13 +806,13 @@ maman_return_foo_get_type_once (void)
GType
maman_return_foo_get_type (void)
{
- static volatile gsize maman_return_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_return_foo_type_id__volatile)) {
+ static volatile gsize maman_return_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_return_foo_type_id__once)) {
GType maman_return_foo_type_id;
maman_return_foo_type_id = maman_return_foo_get_type_once ();
- g_once_init_leave (&maman_return_foo_type_id__volatile, maman_return_foo_type_id);
+ g_once_init_leave (&maman_return_foo_type_id__once, maman_return_foo_type_id);
}
- return maman_return_foo_type_id__volatile;
+ return maman_return_foo_type_id__once;
}
static gint
@@ -961,13 +961,13 @@ maman_return_bar_get_type_once (void)
GType
maman_return_bar_get_type (void)
{
- static volatile gsize maman_return_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_return_bar_type_id__volatile)) {
+ static volatile gsize maman_return_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_return_bar_type_id__once)) {
GType maman_return_bar_type_id;
maman_return_bar_type_id = maman_return_bar_get_type_once ();
- g_once_init_leave (&maman_return_bar_type_id__volatile, maman_return_bar_type_id);
+ g_once_init_leave (&maman_return_bar_type_id__once, maman_return_bar_type_id);
}
- return maman_return_bar_type_id__volatile;
+ return maman_return_bar_type_id__once;
}
static void
diff --git a/tests/objects/singleton.c-expected b/tests/objects/singleton.c-expected
index c8b42dc4b..5bb18fba6 100644
--- a/tests/objects/singleton.c-expected
+++ b/tests/objects/singleton.c-expected
@@ -120,11 +120,11 @@ foo_constructor (GType type,
GObjectClass * parent_class;
static GObject * Foo_singleton__ref = NULL;
static GMutex Foo_singleton__lock;
- static volatile gsize Foo_singleton__volatile = 0;
+ static volatile gsize Foo_singleton__once = 0;
Foo * self;
- if (g_once_init_enter (&Foo_singleton__volatile)) {
+ if (g_once_init_enter (&Foo_singleton__once)) {
g_mutex_init (&Foo_singleton__lock);
- g_once_init_leave (&Foo_singleton__volatile, 42);
+ g_once_init_leave (&Foo_singleton__once, 42);
}
g_mutex_lock (&Foo_singleton__lock);
if (Foo_singleton__ref != NULL) {
@@ -177,13 +177,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -209,11 +209,11 @@ bar_constructor (GType type,
GObjectClass * parent_class;
static GObject * Bar_singleton__ref = NULL;
static GMutex Bar_singleton__lock;
- static volatile gsize Bar_singleton__volatile = 0;
+ static volatile gsize Bar_singleton__once = 0;
Bar * self;
- if (g_once_init_enter (&Bar_singleton__volatile)) {
+ if (g_once_init_enter (&Bar_singleton__once)) {
g_mutex_init (&Bar_singleton__lock);
- g_once_init_leave (&Bar_singleton__volatile, 42);
+ g_once_init_leave (&Bar_singleton__once, 42);
}
g_mutex_lock (&Bar_singleton__lock);
if (Bar_singleton__ref != NULL) {
@@ -266,13 +266,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
diff --git a/tests/objects/test-025.c-expected b/tests/objects/test-025.c-expected
index bc70aeb10..b251c1c05 100644
--- a/tests/objects/test-025.c-expected
+++ b/tests/objects/test-025.c-expected
@@ -145,13 +145,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
static void
@@ -244,12 +244,12 @@ maman_sub_bar_get_type_once (void)
GType
maman_sub_bar_get_type (void)
{
- static volatile gsize maman_sub_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_sub_bar_type_id__volatile)) {
+ static volatile gsize maman_sub_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_sub_bar_type_id__once)) {
GType maman_sub_bar_type_id;
maman_sub_bar_type_id = maman_sub_bar_get_type_once ();
- g_once_init_leave (&maman_sub_bar_type_id__volatile, maman_sub_bar_type_id);
+ g_once_init_leave (&maman_sub_bar_type_id__once, maman_sub_bar_type_id);
}
- return maman_sub_bar_type_id__volatile;
+ return maman_sub_bar_type_id__once;
}
diff --git a/tests/objects/test-026.c-expected b/tests/objects/test-026.c-expected
index 59a894bd3..29be53b9b 100644
--- a/tests/objects/test-026.c-expected
+++ b/tests/objects/test-026.c-expected
@@ -132,13 +132,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
void
@@ -229,12 +229,12 @@ maman_sub_bar_get_type_once (void)
GType
maman_sub_bar_get_type (void)
{
- static volatile gsize maman_sub_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_sub_bar_type_id__volatile)) {
+ static volatile gsize maman_sub_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_sub_bar_type_id__once)) {
GType maman_sub_bar_type_id;
maman_sub_bar_type_id = maman_sub_bar_get_type_once ();
- g_once_init_leave (&maman_sub_bar_type_id__volatile, maman_sub_bar_type_id);
+ g_once_init_leave (&maman_sub_bar_type_id__once, maman_sub_bar_type_id);
}
- return maman_sub_bar_type_id__volatile;
+ return maman_sub_bar_type_id__once;
}
diff --git a/tests/objects/test-029.c-expected b/tests/objects/test-029.c-expected
index 86580b1b6..d2942c7c3 100644
--- a/tests/objects/test-029.c-expected
+++ b/tests/objects/test-029.c-expected
@@ -225,13 +225,13 @@ maman_foo_get_type_once (void)
GType
maman_foo_get_type (void)
{
- static volatile gsize maman_foo_type_id__volatile = 0;
- if (g_once_init_enter (&maman_foo_type_id__volatile)) {
+ static volatile gsize maman_foo_type_id__once = 0;
+ if (g_once_init_enter (&maman_foo_type_id__once)) {
GType maman_foo_type_id;
maman_foo_type_id = maman_foo_get_type_once ();
- g_once_init_leave (&maman_foo_type_id__volatile, maman_foo_type_id);
+ g_once_init_leave (&maman_foo_type_id__once, maman_foo_type_id);
}
- return maman_foo_type_id__volatile;
+ return maman_foo_type_id__once;
}
static void
diff --git a/tests/objects/test-034.c-expected b/tests/objects/test-034.c-expected
index b586b679f..8dffb9553 100644
--- a/tests/objects/test-034.c-expected
+++ b/tests/objects/test-034.c-expected
@@ -182,13 +182,13 @@ maman_a_get_type_once (void)
GType
maman_a_get_type (void)
{
- static volatile gsize maman_a_type_id__volatile = 0;
- if (g_once_init_enter (&maman_a_type_id__volatile)) {
+ static volatile gsize maman_a_type_id__once = 0;
+ if (g_once_init_enter (&maman_a_type_id__once)) {
GType maman_a_type_id;
maman_a_type_id = maman_a_get_type_once ();
- g_once_init_leave (&maman_a_type_id__volatile, maman_a_type_id);
+ g_once_init_leave (&maman_a_type_id__once, maman_a_type_id);
}
- return maman_a_type_id__volatile;
+ return maman_a_type_id__once;
}
MamanB*
@@ -230,13 +230,13 @@ maman_b_get_type_once (void)
GType
maman_b_get_type (void)
{
- static volatile gsize maman_b_type_id__volatile = 0;
- if (g_once_init_enter (&maman_b_type_id__volatile)) {
+ static volatile gsize maman_b_type_id__once = 0;
+ if (g_once_init_enter (&maman_b_type_id__once)) {
GType maman_b_type_id;
maman_b_type_id = maman_b_get_type_once ();
- g_once_init_leave (&maman_b_type_id__volatile, maman_b_type_id);
+ g_once_init_leave (&maman_b_type_id__once, maman_b_type_id);
}
- return maman_b_type_id__volatile;
+ return maman_b_type_id__once;
}
MamanC*
@@ -278,13 +278,13 @@ maman_c_get_type_once (void)
GType
maman_c_get_type (void)
{
- static volatile gsize maman_c_type_id__volatile = 0;
- if (g_once_init_enter (&maman_c_type_id__volatile)) {
+ static volatile gsize maman_c_type_id__once = 0;
+ if (g_once_init_enter (&maman_c_type_id__once)) {
GType maman_c_type_id;
maman_c_type_id = maman_c_get_type_once ();
- g_once_init_leave (&maman_c_type_id__volatile, maman_c_type_id);
+ g_once_init_leave (&maman_c_type_id__once, maman_c_type_id);
}
- return maman_c_type_id__volatile;
+ return maman_c_type_id__once;
}
static void
@@ -543,12 +543,12 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
diff --git a/tests/objects/type-narrowing-by-precondition.c-expected
b/tests/objects/type-narrowing-by-precondition.c-expected
index b62a8e2ae..672d70d72 100644
--- a/tests/objects/type-narrowing-by-precondition.c-expected
+++ b/tests/objects/type-narrowing-by-precondition.c-expected
@@ -291,13 +291,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -369,13 +369,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
diff --git a/tests/objects/type-narrowing-fallback.c-expected
b/tests/objects/type-narrowing-fallback.c-expected
index b7a0771ed..c5ed4c7f8 100644
--- a/tests/objects/type-narrowing-fallback.c-expected
+++ b/tests/objects/type-narrowing-fallback.c-expected
@@ -136,13 +136,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gint
@@ -193,13 +193,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gint
@@ -272,13 +272,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/objects/type-narrowing.c-expected b/tests/objects/type-narrowing.c-expected
index c7deb869a..78d8f78ff 100644
--- a/tests/objects/type-narrowing.c-expected
+++ b/tests/objects/type-narrowing.c-expected
@@ -350,13 +350,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -434,13 +434,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
Manam*
@@ -484,13 +484,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
void
diff --git a/tests/objects/with-expression.c-expected b/tests/objects/with-expression.c-expected
index fb310b26f..7d8bdb913 100644
--- a/tests/objects/with-expression.c-expected
+++ b/tests/objects/with-expression.c-expected
@@ -288,13 +288,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/with-instance.c-expected b/tests/objects/with-instance.c-expected
index 2b8ed153e..8efaf2072 100644
--- a/tests/objects/with-instance.c-expected
+++ b/tests/objects/with-instance.c-expected
@@ -435,13 +435,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -503,13 +503,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
@@ -727,13 +727,13 @@ test_foo_get_type_once (void)
GType
test_foo_get_type (void)
{
- static volatile gsize test_foo_type_id__volatile = 0;
- if (g_once_init_enter (&test_foo_type_id__volatile)) {
+ static volatile gsize test_foo_type_id__once = 0;
+ if (g_once_init_enter (&test_foo_type_id__once)) {
GType test_foo_type_id;
test_foo_type_id = test_foo_get_type_once ();
- g_once_init_leave (&test_foo_type_id__volatile, test_foo_type_id);
+ g_once_init_leave (&test_foo_type_id__once, test_foo_type_id);
}
- return test_foo_type_id__volatile;
+ return test_foo_type_id__once;
}
gpointer
@@ -971,13 +971,13 @@ test_bar_get_type_once (void)
GType
test_bar_get_type (void)
{
- static volatile gsize test_bar_type_id__volatile = 0;
- if (g_once_init_enter (&test_bar_type_id__volatile)) {
+ static volatile gsize test_bar_type_id__once = 0;
+ if (g_once_init_enter (&test_bar_type_id__once)) {
GType test_bar_type_id;
test_bar_type_id = test_bar_get_type_once ();
- g_once_init_leave (&test_bar_type_id__volatile, test_bar_type_id);
+ g_once_init_leave (&test_bar_type_id__once, test_bar_type_id);
}
- return test_bar_type_id__volatile;
+ return test_bar_type_id__once;
}
gpointer
diff --git a/tests/objects/with-nested-in-lambda.c-expected b/tests/objects/with-nested-in-lambda.c-expected
index a7af3ffcb..58969da42 100644
--- a/tests/objects/with-nested-in-lambda.c-expected
+++ b/tests/objects/with-nested-in-lambda.c-expected
@@ -277,13 +277,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/with-nested-method.c-expected b/tests/objects/with-nested-method.c-expected
index 22d990ca3..cfb09338f 100644
--- a/tests/objects/with-nested-method.c-expected
+++ b/tests/objects/with-nested-method.c-expected
@@ -311,13 +311,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -533,13 +533,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/objects/with-nested-signal.c-expected b/tests/objects/with-nested-signal.c-expected
index 5f8d7f6f0..3d55f4e68 100644
--- a/tests/objects/with-nested-signal.c-expected
+++ b/tests/objects/with-nested-signal.c-expected
@@ -325,13 +325,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -404,13 +404,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static Block1Data*
diff --git a/tests/objects/with-nested-unambigous-signal.c-expected
b/tests/objects/with-nested-unambigous-signal.c-expected
index a0366a8d3..f4f1f04c7 100644
--- a/tests/objects/with-nested-unambigous-signal.c-expected
+++ b/tests/objects/with-nested-unambigous-signal.c-expected
@@ -280,13 +280,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/objects/with-nested.c-expected b/tests/objects/with-nested.c-expected
index 711ff201f..29a348258 100644
--- a/tests/objects/with-nested.c-expected
+++ b/tests/objects/with-nested.c-expected
@@ -351,13 +351,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -564,13 +564,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -836,13 +836,13 @@ test_get_type_once (void)
GType
test_get_type (void)
{
- static volatile gsize test_type_id__volatile = 0;
- if (g_once_init_enter (&test_type_id__volatile)) {
+ static volatile gsize test_type_id__once = 0;
+ if (g_once_init_enter (&test_type_id__once)) {
GType test_type_id;
test_type_id = test_get_type_once ();
- g_once_init_leave (&test_type_id__volatile, test_type_id);
+ g_once_init_leave (&test_type_id__once, test_type_id);
}
- return test_type_id__volatile;
+ return test_type_id__once;
}
gpointer
diff --git a/tests/ordering/constant-class.c-expected b/tests/ordering/constant-class.c-expected
index 312b74812..c6ce5c234 100644
--- a/tests/ordering/constant-class.c-expected
+++ b/tests/ordering/constant-class.c-expected
@@ -275,13 +275,13 @@ fooclass_get_type_once (void)
GType
fooclass_get_type (void)
{
- static volatile gsize fooclass_type_id__volatile = 0;
- if (g_once_init_enter (&fooclass_type_id__volatile)) {
+ static volatile gsize fooclass_type_id__once = 0;
+ if (g_once_init_enter (&fooclass_type_id__once)) {
GType fooclass_type_id;
fooclass_type_id = fooclass_get_type_once ();
- g_once_init_leave (&fooclass_type_id__volatile, fooclass_type_id);
+ g_once_init_leave (&fooclass_type_id__once, fooclass_type_id);
}
- return fooclass_type_id__volatile;
+ return fooclass_type_id__once;
}
gpointer
diff --git a/tests/ordering/constant-enum.c-expected b/tests/ordering/constant-enum.c-expected
index 308e19768..d21a63354 100644
--- a/tests/ordering/constant-enum.c-expected
+++ b/tests/ordering/constant-enum.c-expected
@@ -40,13 +40,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static void
diff --git a/tests/ordering/constant-struct.c-expected b/tests/ordering/constant-struct.c-expected
index d85d9c400..79d558cfc 100644
--- a/tests/ordering/constant-struct.c-expected
+++ b/tests/ordering/constant-struct.c-expected
@@ -58,13 +58,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
static void
diff --git a/tests/ordering/delegate-class.c-expected b/tests/ordering/delegate-class.c-expected
index d750f1928..d128ee437 100644
--- a/tests/ordering/delegate-class.c-expected
+++ b/tests/ordering/delegate-class.c-expected
@@ -261,13 +261,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/ordering/delegate-enum.c-expected b/tests/ordering/delegate-enum.c-expected
index ff128a52b..08c0cadf7 100644
--- a/tests/ordering/delegate-enum.c-expected
+++ b/tests/ordering/delegate-enum.c-expected
@@ -35,13 +35,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/ordering/delegate-interface.c-expected b/tests/ordering/delegate-interface.c-expected
index 3a932f3f9..eb971637c 100644
--- a/tests/ordering/delegate-interface.c-expected
+++ b/tests/ordering/delegate-interface.c-expected
@@ -65,13 +65,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/ordering/delegate-struct.c-expected b/tests/ordering/delegate-struct.c-expected
index 415f67326..b4630c7de 100644
--- a/tests/ordering/delegate-struct.c-expected
+++ b/tests/ordering/delegate-struct.c-expected
@@ -54,13 +54,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/ordering/struct-delegate.c-expected b/tests/ordering/struct-delegate.c-expected
index e5ae83e1d..c2a0932e8 100644
--- a/tests/ordering/struct-delegate.c-expected
+++ b/tests/ordering/struct-delegate.c-expected
@@ -54,13 +54,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/parser-keep-going/member-initializer.c-expected
b/tests/parser-keep-going/member-initializer.c-expected
index 30f0cea82..912b045c9 100644
--- a/tests/parser-keep-going/member-initializer.c-expected
+++ b/tests/parser-keep-going/member-initializer.c-expected
@@ -110,13 +110,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -304,13 +304,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/parser/lock-statement.c-expected b/tests/parser/lock-statement.c-expected
index 4b37d7a28..6deb21ef3 100644
--- a/tests/parser/lock-statement.c-expected
+++ b/tests/parser/lock-statement.c-expected
@@ -296,13 +296,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/parser/member-access-pointer.c-expected b/tests/parser/member-access-pointer.c-expected
index c1a2ba795..af66c6eff 100644
--- a/tests/parser/member-access-pointer.c-expected
+++ b/tests/parser/member-access-pointer.c-expected
@@ -77,13 +77,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gint*
diff --git a/tests/parser/member-initializer-empty.c-expected
b/tests/parser/member-initializer-empty.c-expected
index 1f894f513..6e82e37fd 100644
--- a/tests/parser/member-initializer-empty.c-expected
+++ b/tests/parser/member-initializer-empty.c-expected
@@ -250,13 +250,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/parser/member-initializer-trailing-comma.c-expected
b/tests/parser/member-initializer-trailing-comma.c-expected
index ce3495329..70c745aec 100644
--- a/tests/parser/member-initializer-trailing-comma.c-expected
+++ b/tests/parser/member-initializer-trailing-comma.c-expected
@@ -250,13 +250,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/parser/member-initializer.c-expected b/tests/parser/member-initializer.c-expected
index fb619020a..2b018ebf6 100644
--- a/tests/parser/member-initializer.c-expected
+++ b/tests/parser/member-initializer.c-expected
@@ -250,13 +250,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/parser/namespaces.c-expected b/tests/parser/namespaces.c-expected
index 773baadfe..36cfb4b90 100644
--- a/tests/parser/namespaces.c-expected
+++ b/tests/parser/namespaces.c-expected
@@ -329,13 +329,13 @@ global_testclass_get_type_once (void)
GType
global_testclass_get_type (void)
{
- static volatile gsize global_testclass_type_id__volatile = 0;
- if (g_once_init_enter (&global_testclass_type_id__volatile)) {
+ static volatile gsize global_testclass_type_id__once = 0;
+ if (g_once_init_enter (&global_testclass_type_id__once)) {
GType global_testclass_type_id;
global_testclass_type_id = global_testclass_get_type_once ();
- g_once_init_leave (&global_testclass_type_id__volatile, global_testclass_type_id);
+ g_once_init_leave (&global_testclass_type_id__once, global_testclass_type_id);
}
- return global_testclass_type_id__volatile;
+ return global_testclass_type_id__once;
}
gpointer
@@ -424,13 +424,13 @@ maman_bar_get_type_once (void)
GType
maman_bar_get_type (void)
{
- static volatile gsize maman_bar_type_id__volatile = 0;
- if (g_once_init_enter (&maman_bar_type_id__volatile)) {
+ static volatile gsize maman_bar_type_id__once = 0;
+ if (g_once_init_enter (&maman_bar_type_id__once)) {
GType maman_bar_type_id;
maman_bar_type_id = maman_bar_get_type_once ();
- g_once_init_leave (&maman_bar_type_id__volatile, maman_bar_type_id);
+ g_once_init_leave (&maman_bar_type_id__once, maman_bar_type_id);
}
- return maman_bar_type_id__volatile;
+ return maman_bar_type_id__once;
}
FooSubClassInNestedNamespace*
@@ -617,13 +617,13 @@ foo_sub_class_in_nested_namespace_get_type_once (void)
GType
foo_sub_class_in_nested_namespace_get_type (void)
{
- static volatile gsize foo_sub_class_in_nested_namespace_type_id__volatile = 0;
- if (g_once_init_enter (&foo_sub_class_in_nested_namespace_type_id__volatile)) {
+ static volatile gsize foo_sub_class_in_nested_namespace_type_id__once = 0;
+ if (g_once_init_enter (&foo_sub_class_in_nested_namespace_type_id__once)) {
GType foo_sub_class_in_nested_namespace_type_id;
foo_sub_class_in_nested_namespace_type_id = foo_sub_class_in_nested_namespace_get_type_once
();
- g_once_init_leave (&foo_sub_class_in_nested_namespace_type_id__volatile,
foo_sub_class_in_nested_namespace_type_id);
+ g_once_init_leave (&foo_sub_class_in_nested_namespace_type_id__once,
foo_sub_class_in_nested_namespace_type_id);
}
- return foo_sub_class_in_nested_namespace_type_id__volatile;
+ return foo_sub_class_in_nested_namespace_type_id__once;
}
gpointer
diff --git a/tests/parser/qualified-symbol-access.c-expected b/tests/parser/qualified-symbol-access.c-expected
index 65434b71f..824787809 100644
--- a/tests/parser/qualified-symbol-access.c-expected
+++ b/tests/parser/qualified-symbol-access.c-expected
@@ -297,13 +297,13 @@ bar_foo_get_type_once (void)
GType
bar_foo_get_type (void)
{
- static volatile gsize bar_foo_type_id__volatile = 0;
- if (g_once_init_enter (&bar_foo_type_id__volatile)) {
+ static volatile gsize bar_foo_type_id__once = 0;
+ if (g_once_init_enter (&bar_foo_type_id__once)) {
GType bar_foo_type_id;
bar_foo_type_id = bar_foo_get_type_once ();
- g_once_init_leave (&bar_foo_type_id__volatile, bar_foo_type_id);
+ g_once_init_leave (&bar_foo_type_id__once, bar_foo_type_id);
}
- return bar_foo_type_id__volatile;
+ return bar_foo_type_id__once;
}
gpointer
@@ -520,13 +520,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/parser/sealed-class.c-expected b/tests/parser/sealed-class.c-expected
index 8c9afc5a9..c8b4dca91 100644
--- a/tests/parser/sealed-class.c-expected
+++ b/tests/parser/sealed-class.c-expected
@@ -278,13 +278,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -346,13 +346,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/parser/yield-return.c-expected b/tests/parser/yield-return.c-expected
index 33d081d5f..11a23c41e 100644
--- a/tests/parser/yield-return.c-expected
+++ b/tests/parser/yield-return.c-expected
@@ -375,13 +375,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/pointers/delete.c-expected b/tests/pointers/delete.c-expected
index c08e52758..f0652e561 100644
--- a/tests/pointers/delete.c-expected
+++ b/tests/pointers/delete.c-expected
@@ -276,13 +276,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -344,13 +344,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/resolver/peek-inner-types.c-expected b/tests/resolver/peek-inner-types.c-expected
index 4cf2d90d7..66fd9e76a 100644
--- a/tests/resolver/peek-inner-types.c-expected
+++ b/tests/resolver/peek-inner-types.c-expected
@@ -430,13 +430,13 @@ baz_foo_bar1_get_type_once (void)
GType
baz_foo_bar1_get_type (void)
{
- static volatile gsize baz_foo_bar1_type_id__volatile = 0;
- if (g_once_init_enter (&baz_foo_bar1_type_id__volatile)) {
+ static volatile gsize baz_foo_bar1_type_id__once = 0;
+ if (g_once_init_enter (&baz_foo_bar1_type_id__once)) {
GType baz_foo_bar1_type_id;
baz_foo_bar1_type_id = baz_foo_bar1_get_type_once ();
- g_once_init_leave (&baz_foo_bar1_type_id__volatile, baz_foo_bar1_type_id);
+ g_once_init_leave (&baz_foo_bar1_type_id__once, baz_foo_bar1_type_id);
}
- return baz_foo_bar1_type_id__volatile;
+ return baz_foo_bar1_type_id__once;
}
gpointer
@@ -478,13 +478,13 @@ baz_foo_ibar1_get_type_once (void)
GType
baz_foo_ibar1_get_type (void)
{
- static volatile gsize baz_foo_ibar1_type_id__volatile = 0;
- if (g_once_init_enter (&baz_foo_ibar1_type_id__volatile)) {
+ static volatile gsize baz_foo_ibar1_type_id__once = 0;
+ if (g_once_init_enter (&baz_foo_ibar1_type_id__once)) {
GType baz_foo_ibar1_type_id;
baz_foo_ibar1_type_id = baz_foo_ibar1_get_type_once ();
- g_once_init_leave (&baz_foo_ibar1_type_id__volatile, baz_foo_ibar1_type_id);
+ g_once_init_leave (&baz_foo_ibar1_type_id__once, baz_foo_ibar1_type_id);
}
- return baz_foo_ibar1_type_id__volatile;
+ return baz_foo_ibar1_type_id__once;
}
static void
@@ -657,13 +657,13 @@ baz_foo_get_type_once (void)
GType
baz_foo_get_type (void)
{
- static volatile gsize baz_foo_type_id__volatile = 0;
- if (g_once_init_enter (&baz_foo_type_id__volatile)) {
+ static volatile gsize baz_foo_type_id__once = 0;
+ if (g_once_init_enter (&baz_foo_type_id__once)) {
GType baz_foo_type_id;
baz_foo_type_id = baz_foo_get_type_once ();
- g_once_init_leave (&baz_foo_type_id__volatile, baz_foo_type_id);
+ g_once_init_leave (&baz_foo_type_id__once, baz_foo_type_id);
}
- return baz_foo_type_id__volatile;
+ return baz_foo_type_id__once;
}
gpointer
@@ -870,13 +870,13 @@ baz_ifoo_bar2_get_type_once (void)
GType
baz_ifoo_bar2_get_type (void)
{
- static volatile gsize baz_ifoo_bar2_type_id__volatile = 0;
- if (g_once_init_enter (&baz_ifoo_bar2_type_id__volatile)) {
+ static volatile gsize baz_ifoo_bar2_type_id__once = 0;
+ if (g_once_init_enter (&baz_ifoo_bar2_type_id__once)) {
GType baz_ifoo_bar2_type_id;
baz_ifoo_bar2_type_id = baz_ifoo_bar2_get_type_once ();
- g_once_init_leave (&baz_ifoo_bar2_type_id__volatile, baz_ifoo_bar2_type_id);
+ g_once_init_leave (&baz_ifoo_bar2_type_id__once, baz_ifoo_bar2_type_id);
}
- return baz_ifoo_bar2_type_id__volatile;
+ return baz_ifoo_bar2_type_id__once;
}
gpointer
@@ -918,13 +918,13 @@ baz_ifoo_ibar2_get_type_once (void)
GType
baz_ifoo_ibar2_get_type (void)
{
- static volatile gsize baz_ifoo_ibar2_type_id__volatile = 0;
- if (g_once_init_enter (&baz_ifoo_ibar2_type_id__volatile)) {
+ static volatile gsize baz_ifoo_ibar2_type_id__once = 0;
+ if (g_once_init_enter (&baz_ifoo_ibar2_type_id__once)) {
GType baz_ifoo_ibar2_type_id;
baz_ifoo_ibar2_type_id = baz_ifoo_ibar2_get_type_once ();
- g_once_init_leave (&baz_ifoo_ibar2_type_id__volatile, baz_ifoo_ibar2_type_id);
+ g_once_init_leave (&baz_ifoo_ibar2_type_id__once, baz_ifoo_ibar2_type_id);
}
- return baz_ifoo_ibar2_type_id__volatile;
+ return baz_ifoo_ibar2_type_id__once;
}
static void
@@ -946,13 +946,13 @@ baz_ifoo_get_type_once (void)
GType
baz_ifoo_get_type (void)
{
- static volatile gsize baz_ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&baz_ifoo_type_id__volatile)) {
+ static volatile gsize baz_ifoo_type_id__once = 0;
+ if (g_once_init_enter (&baz_ifoo_type_id__once)) {
GType baz_ifoo_type_id;
baz_ifoo_type_id = baz_ifoo_get_type_once ();
- g_once_init_leave (&baz_ifoo_type_id__volatile, baz_ifoo_type_id);
+ g_once_init_leave (&baz_ifoo_type_id__once, baz_ifoo_type_id);
}
- return baz_ifoo_type_id__volatile;
+ return baz_ifoo_type_id__once;
}
BazFooBar1*
@@ -1039,13 +1039,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/semantic/assignment-same-variable.c-expected
b/tests/semantic/assignment-same-variable.c-expected
index e01ab167c..8fa29a4b4 100644
--- a/tests/semantic/assignment-same-variable.c-expected
+++ b/tests/semantic/assignment-same-variable.c-expected
@@ -256,13 +256,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/semantic/floating-reference-base-method.c-expected
b/tests/semantic/floating-reference-base-method.c-expected
index 4d3d90528..77d97147b 100644
--- a/tests/semantic/floating-reference-base-method.c-expected
+++ b/tests/semantic/floating-reference-base-method.c-expected
@@ -166,13 +166,13 @@ ifoo_get_type_once (void)
GType
ifoo_get_type (void)
{
- static volatile gsize ifoo_type_id__volatile = 0;
- if (g_once_init_enter (&ifoo_type_id__volatile)) {
+ static volatile gsize ifoo_type_id__once = 0;
+ if (g_once_init_enter (&ifoo_type_id__once)) {
GType ifoo_type_id;
ifoo_type_id = ifoo_get_type_once ();
- g_once_init_leave (&ifoo_type_id__volatile, ifoo_type_id);
+ g_once_init_leave (&ifoo_type_id__once, ifoo_type_id);
}
- return ifoo_type_id__volatile;
+ return ifoo_type_id__once;
}
GInitiallyUnowned*
@@ -205,13 +205,13 @@ ibar_get_type_once (void)
GType
ibar_get_type (void)
{
- static volatile gsize ibar_type_id__volatile = 0;
- if (g_once_init_enter (&ibar_type_id__volatile)) {
+ static volatile gsize ibar_type_id__once = 0;
+ if (g_once_init_enter (&ibar_type_id__once)) {
GType ibar_type_id;
ibar_type_id = ibar_get_type_once ();
- g_once_init_leave (&ibar_type_id__volatile, ibar_type_id);
+ g_once_init_leave (&ibar_type_id__once, ibar_type_id);
}
- return ibar_type_id__volatile;
+ return ibar_type_id__once;
}
static GInitiallyUnowned*
@@ -480,13 +480,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -570,13 +570,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
static void
diff --git a/tests/semantic/localvariable-var-pointer-initializer.c-expected
b/tests/semantic/localvariable-var-pointer-initializer.c-expected
index b4bf0569a..ebcf2a83c 100644
--- a/tests/semantic/localvariable-var-pointer-initializer.c-expected
+++ b/tests/semantic/localvariable-var-pointer-initializer.c-expected
@@ -81,13 +81,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/semantic/member-access-static-transformed-qualified.c-expected
b/tests/semantic/member-access-static-transformed-qualified.c-expected
index 825bb0c07..d81553866 100644
--- a/tests/semantic/member-access-static-transformed-qualified.c-expected
+++ b/tests/semantic/member-access-static-transformed-qualified.c-expected
@@ -295,13 +295,13 @@ manam_manam_get_type_once (void)
GType
manam_manam_get_type (void)
{
- static volatile gsize manam_manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_manam_type_id__volatile)) {
+ static volatile gsize manam_manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_manam_type_id__once)) {
GType manam_manam_type_id;
manam_manam_type_id = manam_manam_get_type_once ();
- g_once_init_leave (&manam_manam_type_id__volatile, manam_manam_type_id);
+ g_once_init_leave (&manam_manam_type_id__once, manam_manam_type_id);
}
- return manam_manam_type_id__volatile;
+ return manam_manam_type_id__once;
}
gpointer
@@ -513,13 +513,13 @@ manam_foo_get_type_once (void)
GType
manam_foo_get_type (void)
{
- static volatile gsize manam_foo_type_id__volatile = 0;
- if (g_once_init_enter (&manam_foo_type_id__volatile)) {
+ static volatile gsize manam_foo_type_id__once = 0;
+ if (g_once_init_enter (&manam_foo_type_id__once)) {
GType manam_foo_type_id;
manam_foo_type_id = manam_foo_get_type_once ();
- g_once_init_leave (&manam_foo_type_id__volatile, manam_foo_type_id);
+ g_once_init_leave (&manam_foo_type_id__once, manam_foo_type_id);
}
- return manam_foo_type_id__volatile;
+ return manam_foo_type_id__once;
}
gpointer
diff --git a/tests/semantic/member-access-static-with-instance.c-expected
b/tests/semantic/member-access-static-with-instance.c-expected
index 1e589ffbc..fc27197c9 100644
--- a/tests/semantic/member-access-static-with-instance.c-expected
+++ b/tests/semantic/member-access-static-with-instance.c-expected
@@ -62,13 +62,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/semantic/member-access-transformed-qualified.c-expected
b/tests/semantic/member-access-transformed-qualified.c-expected
index 9433c599e..5b26dfc66 100644
--- a/tests/semantic/member-access-transformed-qualified.c-expected
+++ b/tests/semantic/member-access-transformed-qualified.c-expected
@@ -261,13 +261,13 @@ foo_manam_foo_get_type_once (void)
GType
foo_manam_foo_get_type (void)
{
- static volatile gsize foo_manam_foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_manam_foo_type_id__volatile)) {
+ static volatile gsize foo_manam_foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_manam_foo_type_id__once)) {
GType foo_manam_foo_type_id;
foo_manam_foo_type_id = foo_manam_foo_get_type_once ();
- g_once_init_leave (&foo_manam_foo_type_id__volatile, foo_manam_foo_type_id);
+ g_once_init_leave (&foo_manam_foo_type_id__once, foo_manam_foo_type_id);
}
- return foo_manam_foo_type_id__volatile;
+ return foo_manam_foo_type_id__once;
}
gpointer
diff --git a/tests/semantic/with-declaration-cast-type.c-expected
b/tests/semantic/with-declaration-cast-type.c-expected
index 95d83e04d..497e40268 100644
--- a/tests/semantic/with-declaration-cast-type.c-expected
+++ b/tests/semantic/with-declaration-cast-type.c-expected
@@ -274,13 +274,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
@@ -342,13 +342,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/semantic/with-declaration.c-expected b/tests/semantic/with-declaration.c-expected
index 3774c1bdc..3f0957f05 100644
--- a/tests/semantic/with-declaration.c-expected
+++ b/tests/semantic/with-declaration.c-expected
@@ -255,13 +255,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/semantic/with-dereferenced-pointer.c-expected
b/tests/semantic/with-dereferenced-pointer.c-expected
index 616fc758d..1faf737e2 100644
--- a/tests/semantic/with-dereferenced-pointer.c-expected
+++ b/tests/semantic/with-dereferenced-pointer.c-expected
@@ -254,13 +254,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/semantic/with-enum-member.c-expected b/tests/semantic/with-enum-member.c-expected
index a60d110d8..d7347f70b 100644
--- a/tests/semantic/with-enum-member.c-expected
+++ b/tests/semantic/with-enum-member.c-expected
@@ -34,13 +34,13 @@ foo_enum_get_type_once (void)
GType
foo_enum_get_type (void)
{
- static volatile gsize foo_enum_type_id__volatile = 0;
- if (g_once_init_enter (&foo_enum_type_id__volatile)) {
+ static volatile gsize foo_enum_type_id__once = 0;
+ if (g_once_init_enter (&foo_enum_type_id__once)) {
GType foo_enum_type_id;
foo_enum_type_id = foo_enum_get_type_once ();
- g_once_init_leave (&foo_enum_type_id__volatile, foo_enum_type_id);
+ g_once_init_leave (&foo_enum_type_id__once, foo_enum_type_id);
}
- return foo_enum_type_id__volatile;
+ return foo_enum_type_id__once;
}
static void
diff --git a/tests/semantic/with-null.c-expected b/tests/semantic/with-null.c-expected
index 452d2995c..0d5488110 100644
--- a/tests/semantic/with-null.c-expected
+++ b/tests/semantic/with-null.c-expected
@@ -250,13 +250,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
gpointer
diff --git a/tests/structs/bug530605.c-expected b/tests/structs/bug530605.c-expected
index ea12f5aa2..36d036036 100644
--- a/tests/structs/bug530605.c-expected
+++ b/tests/structs/bug530605.c-expected
@@ -103,13 +103,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
diff --git a/tests/structs/bug572091.c-expected b/tests/structs/bug572091.c-expected
index 9c8216849..8046ad9b7 100644
--- a/tests/structs/bug572091.c-expected
+++ b/tests/structs/bug572091.c-expected
@@ -58,13 +58,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/bug583603.c-expected b/tests/structs/bug583603.c-expected
index 5e013309f..8bbabae59 100644
--- a/tests/structs/bug583603.c-expected
+++ b/tests/structs/bug583603.c-expected
@@ -57,13 +57,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug595587.c-expected b/tests/structs/bug595587.c-expected
index c4de2eb1c..3d5f56781 100644
--- a/tests/structs/bug595587.c-expected
+++ b/tests/structs/bug595587.c-expected
@@ -103,13 +103,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -305,13 +305,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/structs/bug596144.c-expected b/tests/structs/bug596144.c-expected
index 7ca28e236..eed540bf7 100644
--- a/tests/structs/bug596144.c-expected
+++ b/tests/structs/bug596144.c-expected
@@ -86,13 +86,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug603056.c-expected b/tests/structs/bug603056.c-expected
index 00a7ba3c4..7530689b9 100644
--- a/tests/structs/bug603056.c-expected
+++ b/tests/structs/bug603056.c-expected
@@ -57,13 +57,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug606202.c-expected b/tests/structs/bug606202.c-expected
index 3087d4599..eb909283e 100644
--- a/tests/structs/bug606202.c-expected
+++ b/tests/structs/bug606202.c-expected
@@ -153,13 +153,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static inline gpointer
@@ -384,13 +384,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
diff --git a/tests/structs/bug613513.c-expected b/tests/structs/bug613513.c-expected
index 820f33cfe..f0af93b38 100644
--- a/tests/structs/bug613513.c-expected
+++ b/tests/structs/bug613513.c-expected
@@ -65,13 +65,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug613825.c-expected b/tests/structs/bug613825.c-expected
index d70336d3e..fd6775b9d 100644
--- a/tests/structs/bug613825.c-expected
+++ b/tests/structs/bug613825.c-expected
@@ -57,13 +57,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug621176.c-expected b/tests/structs/bug621176.c-expected
index 696b206ac..77cae8937 100644
--- a/tests/structs/bug621176.c-expected
+++ b/tests/structs/bug621176.c-expected
@@ -57,13 +57,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug622422.c-expected b/tests/structs/bug622422.c-expected
index dc6b2bf0e..561b64dd1 100644
--- a/tests/structs/bug622422.c-expected
+++ b/tests/structs/bug622422.c-expected
@@ -69,13 +69,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/bug623092.c-expected b/tests/structs/bug623092.c-expected
index 02791555a..003620863 100644
--- a/tests/structs/bug623092.c-expected
+++ b/tests/structs/bug623092.c-expected
@@ -71,13 +71,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/bug651441.c-expected b/tests/structs/bug651441.c-expected
index a11b15f0d..05d396860 100644
--- a/tests/structs/bug651441.c-expected
+++ b/tests/structs/bug651441.c-expected
@@ -55,13 +55,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/bug654753.c-expected b/tests/structs/bug654753.c-expected
index 91c69baba..4c60a22ac 100644
--- a/tests/structs/bug654753.c-expected
+++ b/tests/structs/bug654753.c-expected
@@ -68,13 +68,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug656693.c-expected b/tests/structs/bug656693.c-expected
index 838a0d53e..392fe9d3b 100644
--- a/tests/structs/bug656693.c-expected
+++ b/tests/structs/bug656693.c-expected
@@ -59,13 +59,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/bug660426.c-expected b/tests/structs/bug660426.c-expected
index 3915de253..7aec498f7 100644
--- a/tests/structs/bug660426.c-expected
+++ b/tests/structs/bug660426.c-expected
@@ -101,13 +101,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug661945.c-expected b/tests/structs/bug661945.c-expected
index 06becc5d2..5d699a612 100644
--- a/tests/structs/bug661945.c-expected
+++ b/tests/structs/bug661945.c-expected
@@ -62,13 +62,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static GVariant*
diff --git a/tests/structs/bug667890.c-expected b/tests/structs/bug667890.c-expected
index 5ddc58ed0..2bc1d446f 100644
--- a/tests/structs/bug667890.c-expected
+++ b/tests/structs/bug667890.c-expected
@@ -69,13 +69,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/structs/bug669580.c-expected b/tests/structs/bug669580.c-expected
index 255621b6c..1b00223a9 100644
--- a/tests/structs/bug669580.c-expected
+++ b/tests/structs/bug669580.c-expected
@@ -59,13 +59,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -94,13 +94,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/structs/bug686190.c-expected b/tests/structs/bug686190.c-expected
index 3e05e5e45..67b25b0c9 100644
--- a/tests/structs/bug686190.c-expected
+++ b/tests/structs/bug686190.c-expected
@@ -64,13 +64,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/bug688732.c-expected b/tests/structs/bug688732.c-expected
index d0717e990..c5bd3e224 100644
--- a/tests/structs/bug688732.c-expected
+++ b/tests/structs/bug688732.c-expected
@@ -79,13 +79,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -131,13 +131,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/structs/bug690380.c-expected b/tests/structs/bug690380.c-expected
index 8179531e6..aa4c9f7ce 100644
--- a/tests/structs/bug690380.c-expected
+++ b/tests/structs/bug690380.c-expected
@@ -65,13 +65,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -100,13 +100,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gboolean
diff --git a/tests/structs/bug749952.c-expected b/tests/structs/bug749952.c-expected
index f2f605568..b10c074e0 100644
--- a/tests/structs/bug749952.c-expected
+++ b/tests/structs/bug749952.c-expected
@@ -65,13 +65,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
@@ -100,13 +100,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gboolean
diff --git a/tests/structs/bug775761.c-expected b/tests/structs/bug775761.c-expected
index 7edb24f09..f6843cc0a 100644
--- a/tests/structs/bug775761.c-expected
+++ b/tests/structs/bug775761.c-expected
@@ -97,13 +97,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gboolean
diff --git a/tests/structs/bug777194.c-expected b/tests/structs/bug777194.c-expected
index 22a22e517..927043755 100644
--- a/tests/structs/bug777194.c-expected
+++ b/tests/structs/bug777194.c-expected
@@ -73,13 +73,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
diff --git a/tests/structs/cast-struct-boxed.c-expected b/tests/structs/cast-struct-boxed.c-expected
index 27102f8c1..78a2891cb 100644
--- a/tests/structs/cast-struct-boxed.c-expected
+++ b/tests/structs/cast-struct-boxed.c-expected
@@ -85,13 +85,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -243,13 +243,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gpointer
diff --git a/tests/structs/constructor-params-array.c-expected
b/tests/structs/constructor-params-array.c-expected
index b75fe4e0a..cf1b5e63c 100644
--- a/tests/structs/constructor-params-array.c-expected
+++ b/tests/structs/constructor-params-array.c-expected
@@ -195,13 +195,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/constructor-variadic.c-expected b/tests/structs/constructor-variadic.c-expected
index a40d668ba..243135c61 100644
--- a/tests/structs/constructor-variadic.c-expected
+++ b/tests/structs/constructor-variadic.c-expected
@@ -110,13 +110,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/default-gtype.c-expected b/tests/structs/default-gtype.c-expected
index 554b4d1b6..93efcd45a 100644
--- a/tests/structs/default-gtype.c-expected
+++ b/tests/structs/default-gtype.c-expected
@@ -60,13 +60,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
Bar*
diff --git a/tests/structs/gtype-base-struct.c-expected b/tests/structs/gtype-base-struct.c-expected
index e7179b09e..e5966d7ed 100644
--- a/tests/structs/gtype-base-struct.c-expected
+++ b/tests/structs/gtype-base-struct.c-expected
@@ -476,13 +476,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/gvalue.c-expected b/tests/structs/gvalue.c-expected
index b6139ec2d..9d55b45a5 100644
--- a/tests/structs/gvalue.c-expected
+++ b/tests/structs/gvalue.c-expected
@@ -797,13 +797,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
gpointer
@@ -845,13 +845,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
Foo*
@@ -911,13 +911,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -1047,13 +1047,13 @@ foo_struct_get_type_once (void)
GType
foo_struct_get_type (void)
{
- static volatile gsize foo_struct_type_id__volatile = 0;
- if (g_once_init_enter (&foo_struct_type_id__volatile)) {
+ static volatile gsize foo_struct_type_id__once = 0;
+ if (g_once_init_enter (&foo_struct_type_id__once)) {
GType foo_struct_type_id;
foo_struct_type_id = foo_struct_get_type_once ();
- g_once_init_leave (&foo_struct_type_id__volatile, foo_struct_type_id);
+ g_once_init_leave (&foo_struct_type_id__once, foo_struct_type_id);
}
- return foo_struct_type_id__volatile;
+ return foo_struct_type_id__once;
}
static gchar**
diff --git a/tests/structs/properties.c-expected b/tests/structs/properties.c-expected
index 5826926d7..305ce0ca4 100644
--- a/tests/structs/properties.c-expected
+++ b/tests/structs/properties.c-expected
@@ -188,13 +188,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/struct-base-types.c-expected b/tests/structs/struct-base-types.c-expected
index 81b8b4335..6b12fe36d 100644
--- a/tests/structs/struct-base-types.c-expected
+++ b/tests/structs/struct-base-types.c-expected
@@ -90,13 +90,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -144,13 +144,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/structs/struct-boxed-cast.c-expected b/tests/structs/struct-boxed-cast.c-expected
index 2b3784cb3..ebaa0fb62 100644
--- a/tests/structs/struct-boxed-cast.c-expected
+++ b/tests/structs/struct-boxed-cast.c-expected
@@ -100,13 +100,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static gpointer
diff --git a/tests/structs/struct-initializer-list-in-array.c-expected
b/tests/structs/struct-initializer-list-in-array.c-expected
index f740399d5..5c5d2e572 100644
--- a/tests/structs/struct-initializer-list-in-array.c-expected
+++ b/tests/structs/struct-initializer-list-in-array.c-expected
@@ -139,13 +139,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
void
@@ -194,13 +194,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
static void
diff --git a/tests/structs/struct-initializer-list-nested.c-expected
b/tests/structs/struct-initializer-list-nested.c-expected
index 8f8b83e5c..d1aabef1a 100644
--- a/tests/structs/struct-initializer-list-nested.c-expected
+++ b/tests/structs/struct-initializer-list-nested.c-expected
@@ -102,13 +102,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static gpointer
@@ -165,13 +165,13 @@ bar_get_type_once (void)
GType
bar_get_type (void)
{
- static volatile gsize bar_type_id__volatile = 0;
- if (g_once_init_enter (&bar_type_id__volatile)) {
+ static volatile gsize bar_type_id__once = 0;
+ if (g_once_init_enter (&bar_type_id__once)) {
GType bar_type_id;
bar_type_id = bar_get_type_once ();
- g_once_init_leave (&bar_type_id__volatile, bar_type_id);
+ g_once_init_leave (&bar_type_id__once, bar_type_id);
}
- return bar_type_id__volatile;
+ return bar_type_id__once;
}
void
@@ -224,13 +224,13 @@ manam_get_type_once (void)
GType
manam_get_type (void)
{
- static volatile gsize manam_type_id__volatile = 0;
- if (g_once_init_enter (&manam_type_id__volatile)) {
+ static volatile gsize manam_type_id__once = 0;
+ if (g_once_init_enter (&manam_type_id__once)) {
GType manam_type_id;
manam_type_id = manam_get_type_once ();
- g_once_init_leave (&manam_type_id__volatile, manam_type_id);
+ g_once_init_leave (&manam_type_id__once, manam_type_id);
}
- return manam_type_id__volatile;
+ return manam_type_id__once;
}
Baz*
@@ -259,13 +259,13 @@ baz_get_type_once (void)
GType
baz_get_type (void)
{
- static volatile gsize baz_type_id__volatile = 0;
- if (g_once_init_enter (&baz_type_id__volatile)) {
+ static volatile gsize baz_type_id__once = 0;
+ if (g_once_init_enter (&baz_type_id__once)) {
GType baz_type_id;
baz_type_id = baz_get_type_once ();
- g_once_init_leave (&baz_type_id__volatile, baz_type_id);
+ g_once_init_leave (&baz_type_id__once, baz_type_id);
}
- return baz_type_id__volatile;
+ return baz_type_id__once;
}
static gpointer
diff --git a/tests/structs/struct-static-field-initializer.c-expected
b/tests/structs/struct-static-field-initializer.c-expected
index 7701a87e1..6c6c16470 100644
--- a/tests/structs/struct-static-field-initializer.c-expected
+++ b/tests/structs/struct-static-field-initializer.c-expected
@@ -59,13 +59,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/struct_only.c-expected b/tests/structs/struct_only.c-expected
index dba7370e0..fe1b35e0b 100644
--- a/tests/structs/struct_only.c-expected
+++ b/tests/structs/struct_only.c-expected
@@ -53,13 +53,13 @@ foo_get_type_once (void)
GType
foo_get_type (void)
{
- static volatile gsize foo_type_id__volatile = 0;
- if (g_once_init_enter (&foo_type_id__volatile)) {
+ static volatile gsize foo_type_id__once = 0;
+ if (g_once_init_enter (&foo_type_id__once)) {
GType foo_type_id;
foo_type_id = foo_get_type_once ();
- g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+ g_once_init_leave (&foo_type_id__once, foo_type_id);
}
- return foo_type_id__volatile;
+ return foo_type_id__once;
}
static void
diff --git a/tests/structs/structs.c-expected b/tests/structs/structs.c-expected
index 6d86fbf34..21f15f50e 100644
--- a/tests/structs/structs.c-expected
+++ b/tests/structs/structs.c-expected
@@ -120,13 +120,13 @@ simple_struct_get_type_once (void)
GType
simple_struct_get_type (void)
{
- static volatile gsize simple_struct_type_id__volatile = 0;
- if (g_once_init_enter (&simple_struct_type_id__volatile)) {
+ static volatile gsize simple_struct_type_id__once = 0;
+ if (g_once_init_enter (&simple_struct_type_id__once)) {
GType simple_struct_type_id;
simple_struct_type_id = simple_struct_get_type_once ();
- g_once_init_leave (&simple_struct_type_id__volatile, simple_struct_type_id);
+ g_once_init_leave (&simple_struct_type_id__once, simple_struct_type_id);
}
- return simple_struct_type_id__volatile;
+ return simple_struct_type_id__once;
}
PublicStruct*
@@ -155,13 +155,13 @@ public_struct_get_type_once (void)
GType
public_struct_get_type (void)
{
- static volatile gsize public_struct_type_id__volatile = 0;
- if (g_once_init_enter (&public_struct_type_id__volatile)) {
+ static volatile gsize public_struct_type_id__once = 0;
+ if (g_once_init_enter (&public_struct_type_id__once)) {
GType public_struct_type_id;
public_struct_type_id = public_struct_get_type_once ();
- g_once_init_leave (&public_struct_type_id__volatile, public_struct_type_id);
+ g_once_init_leave (&public_struct_type_id__once, public_struct_type_id);
}
- return public_struct_type_id__volatile;
+ return public_struct_type_id__once;
}
void
@@ -199,13 +199,13 @@ struct_with_creation_method_get_type_once (void)
GType
struct_with_creation_method_get_type (void)
{
- static volatile gsize struct_with_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (&struct_with_creation_method_type_id__volatile)) {
+ static volatile gsize struct_with_creation_method_type_id__once = 0;
+ if (g_once_init_enter (&struct_with_creation_method_type_id__once)) {
GType struct_with_creation_method_type_id;
struct_with_creation_method_type_id = struct_with_creation_method_get_type_once ();
- g_once_init_leave (&struct_with_creation_method_type_id__volatile,
struct_with_creation_method_type_id);
+ g_once_init_leave (&struct_with_creation_method_type_id__once,
struct_with_creation_method_type_id);
}
- return struct_with_creation_method_type_id__volatile;
+ return struct_with_creation_method_type_id__once;
}
void
@@ -243,13 +243,13 @@ struct_with_named_creation_method_get_type_once (void)
GType
struct_with_named_creation_method_get_type (void)
{
- static volatile gsize struct_with_named_creation_method_type_id__volatile = 0;
- if (g_once_init_enter (&struct_with_named_creation_method_type_id__volatile)) {
+ static volatile gsize struct_with_named_creation_method_type_id__once = 0;
+ if (g_once_init_enter (&struct_with_named_creation_method_type_id__once)) {
GType struct_with_named_creation_method_type_id;
struct_with_named_creation_method_type_id = struct_with_named_creation_method_get_type_once
();
- g_once_init_leave (&struct_with_named_creation_method_type_id__volatile,
struct_with_named_creation_method_type_id);
+ g_once_init_leave (&struct_with_named_creation_method_type_id__once,
struct_with_named_creation_method_type_id);
}
- return struct_with_named_creation_method_type_id__volatile;
+ return struct_with_named_creation_method_type_id__once;
}
void
@@ -334,13 +334,13 @@ struct_with_func_get_type_once (void)
GType
struct_with_func_get_type (void)
{
- static volatile gsize struct_with_func_type_id__volatile = 0;
- if (g_once_init_enter (&struct_with_func_type_id__volatile)) {
+ static volatile gsize struct_with_func_type_id__once = 0;
+ if (g_once_init_enter (&struct_with_func_type_id__once)) {
GType struct_with_func_type_id;
struct_with_func_type_id = struct_with_func_get_type_once ();
- g_once_init_leave (&struct_with_func_type_id__volatile, struct_with_func_type_id);
+ g_once_init_leave (&struct_with_func_type_id__once, struct_with_func_type_id);
}
- return struct_with_func_type_id__volatile;
+ return struct_with_func_type_id__once;
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
