Changeset 247149 in webkit

Timestamp:

Jul 5, 2019 4:23:19 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

[ATK] Do not use C linkage for functions using C++ features
​https://bugs.webkit.org/show_bug.cgi?id=199510
<rdar://problem/52674702>

Reviewed by Carlos Garcia Campos.

No new tests needed.

• accessibility/atk/WebKitAccessible.h: Move function and type declarations involving

C++ features outside of the block delimited by the G_BEGIN_DECLS and G_END_DECLS macros,
which were setting the C linkage.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/atk/WebKitAccessible.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-05  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [ATK] Do not use C linkage for functions using C++ features
+        https://bugs.webkit.org/show_bug.cgi?id=199510
+        <rdar://problem/52674702>
+
+        Reviewed by Carlos Garcia Campos.
+
+        No new tests needed.
+
+        * accessibility/atk/WebKitAccessible.h: Move function and type declarations involving
+        C++ features outside of the block delimited by the G_BEGIN_DECLS and G_END_DECLS macros,
+        which were setting the C linkage.
+
 2019-07-05  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessible.h

@@ -56 +56 @@
 };
 
+GType webkit_accessible_get_type(void);
+
+G_END_DECLS
+
+// The definitions below are only used in C++ code, and some use C++ types,
+// therefore they should be outside of the G_BEGIN_DECLS/G_END_DECLS block
+// to make them use the C++ ABI.
+
 enum AtkCachedProperty {
     AtkCachedAccessibleName,
@@ -68 +76 @@
 };
 
-GType webkit_accessible_get_type(void);
-
 WebKitAccessible* webkitAccessibleNew(WebCore::AccessibilityObject*);
 
@@ -80 +86 @@
 const char* webkitAccessibleCacheAndReturnAtkProperty(WebKitAccessible*, AtkCachedProperty, CString&&);
 
-G_END_DECLS
-
 #endif // HAVE(ACCESSIBILITY)