Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl

Issue 70193010: Update harfbuzz-ng to 0.9.24 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-gobject.h ('k') | third_party/harfbuzz-ng/src/hb-gobject-structs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl
diff --git a/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl b/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl
index 05abd898d4f081b84e23c051ae2306a2164e7032..ca458a3846cb0b0628a15b572a3478b6cbbd2a0f 100644
--- a/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl
+++ b/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl
@@ -45,13 +45,12 @@
/*** END file-production ***/
/*** BEGIN value-header ***/
-inline static /* TODO(behdad) disable these for now until we fix them... */
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize type_id = 0;
- if (g_once_init_enter (&g_define_type_id__volatile))
+ if (g_once_init_enter (&type_id))
{
static const G@Type@Value values[] = {
/*** END value-header ***/
@@ -63,12 +62,12 @@ GType
/*** BEGIN value-tail ***/
{ 0, NULL, NULL }
};
- GType g_define_type_id =
+ GType id =
g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ g_once_init_leave (&type_id, id);
}
- return g_define_type_id__volatile;
+ return type_id;
}
/*** END value-tail ***/
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-gobject.h ('k') | third_party/harfbuzz-ng/src/hb-gobject-structs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698