Changeset 45911 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 15, 2009, 8:18:42 AM (16 years ago)

Author:

Simon Hausmann

Message:

2009-07-07 Norbert Leser <​[email protected]>

Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=27056

Alternate bool operator for codewarrior compiler (WINSCW).
Compiler (latest b482) reports error for UnspecifiedBoolType construct:
"illegal explicit conversion from 'WTF::OwnArrayPtr<JSC::Register>' to 'bool'"

Same fix as in r38391.

• JavaScriptCore/wtf/OwnArrayPtr.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/OwnArrayPtr.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-07-07  Norbert Leser  <[email protected]>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27056
+
+        Alternate bool operator for codewarrior compiler (WINSCW).
+        Compiler (latest b482) reports error for UnspecifiedBoolType construct:
+        "illegal explicit conversion from 'WTF::OwnArrayPtr<JSC::Register>' to 'bool'"
+
+        Same fix as in r38391.
+
+        * JavaScriptCore/wtf/OwnArrayPtr.h:
+
 2009-07-15  Norbert Leser  <[email protected]>
 

trunk/JavaScriptCore/wtf/OwnArrayPtr.h

@@ -47 +47 @@
 
         // This conversion operator allows implicit conversion to bool but not to other integer types.
+#if COMPILER(WINSCW)
+        operator bool() const { return m_ptr; }
+#else
         typedef T* OwnArrayPtr::*UnspecifiedBoolType;
         operator UnspecifiedBoolType() const { return m_ptr ? &OwnArrayPtr::m_ptr : 0; }
+#endif
 
         void swap(OwnArrayPtr& o) { std::swap(m_ptr, o.m_ptr); }