Changeset 268543 in webkit

Timestamp:

Oct 15, 2020 12:12:02 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

WeakObjCPtr.h is not safe to include in C++ source files
<​https://webkit.org/b/217712>
<rdar://problem/70250667>

Reviewed by Darin Adler.

• wtf/WeakObjCPtr.h:

(WTF::WeakObjCPtr::get const):

• Move implementation outside of the class and wrap it in #ifdef OBJC/#endif. This makes the header safe to compile with other C++ sources, but will fail if get() is used in a C++ source file.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/WeakObjCPtr.h (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-10-15  David Kilzer  <ddkilzer@apple.com>
+
+        WeakObjCPtr.h is not safe to include in C++ source files
+        <https://webkit.org/b/217712>
+        <rdar://problem/70250667>
+
+        Reviewed by Darin Adler.
+
+        * wtf/WeakObjCPtr.h:
+        (WTF::WeakObjCPtr::get const):
+        - Move implementation outside of the class and wrap it in
+          #ifdef __OBJC__/#endif.  This makes the header safe to compile
+          with other C++ sources, but will fail if get() is used in a
+          C++ source file.
+
 2020-10-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WTF/wtf/WeakObjCPtr.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82 +82 @@
     }
 
-    RetainPtr<ValueType> get() const
-    {
-#if __has_feature(objc_arc)
-        return static_cast<ValueType *>(m_weakReference);
-#else
-        return adoptNS(objc_loadWeakRetained(&m_weakReference));
-#endif
-    }
+    RetainPtr<ValueType> get() const;
 
     ValueType *getAutoreleased() const
@@ -111 +104 @@
 };
 
+#ifdef __OBJC__
+template<typename T>
+RetainPtr<typename WeakObjCPtr<T>::ValueType> WeakObjCPtr<T>::get() const
+{
+#if __has_feature(objc_arc)
+    return static_cast<typename WeakObjCPtr<T>::ValueType *>(m_weakReference);
+#else
+    return adoptNS(objc_loadWeakRetained(&m_weakReference));
+#endif
+}
+#endif
+
 } // namespace WTF