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+.

8 files changed, 52 insertions, 52 deletions

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