143884 2015-04-17 11:03:48 -0700 Prefix isnan() with std 2016-06-03 18:41:38 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137488 1 mcrha mcrha benjamin cdumez cmarcelo commit-queue joepeck oldest_to_newest 1086357 0 mcrha 2015-04-17 11:03:48 -0700 Similar to bug #137966, the msys/mingw requires isnan() to be prefixed with std namespace, otherwise the build breaks. 1086360 1 251030 mcrha 2015-04-17 11:06:09 -0700 Created attachment 251030 proposed wk patch Simply do it. 1086374 2 cdumez 2015-04-17 11:27:53 -0700 Fails to build on Mac: /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:471:72: error: expected unqualified-id return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); ^ In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:1: In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/JavaScriptCorePrefix.h:10: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/math.h:179:7: note: expanded from macro 'isnan' ( sizeof(x) == sizeof(float) ? __inline_isnanf((float)(x)) \ ^ /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:471:105: error: expected unqualified-id return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); ^ In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:1: In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/JavaScriptCorePrefix.h:10: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/math.h:179:7: note: expanded from macro 'isnan' ( sizeof(x) == sizeof(float) ? __inline_isnanf((float)(x)) \ ^ /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:471:105: error: expected expression In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/runtime/Options.cpp:1: In file included from /Volumes/Data/EWS/WebKit/Source/JavaScriptCore/JavaScriptCorePrefix.h:10: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/math.h:181:70: note: expanded from macro 'isnan' : __inline_isnanl((long double)(x))) ^ 3 errors generated. 1086375 3 251030 cdumez 2015-04-17 11:29:36 -0700 Comment on attachment 251030 proposed wk patch View in context: https://bugs.webkit.org/attachment.cgi?id=251030&action=review > Source/JavaScriptCore/runtime/Options.cpp:471 > + return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); I think the problem is that this file includes math.h instead of cmath 1086376 4 251030 cdumez 2015-04-17 11:32:55 -0700 Comment on attachment 251030 proposed wk patch r=me with the header include fixed. 1087879 5 mcrha 2015-04-23 10:38:51 -0700 (In reply to comment #3) > I think the problem is that this file includes math.h instead of cmath It might not be it, the Stopwatch.h includes cmath, but fails anyway. 1199180 6 joepeck 2016-06-03 18:41:38 -0700 Looks like someone else fixed these in: https://trac.webkit.org/changeset/187019 Marking bug as resolved. 251030 2015-04-17 11:06:09 -0700 2015-04-17 11:32:55 -0700 proposed wk patch wk.patch text/plain 3391 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGM2N2I4YjUuLjBlNWZmOTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA0LTE3ICBNaWxhbiBDcmhhICA8 bWNyaGFAcmVkaGF0LmNvbT4KKworICAgICAgICBQcmVmaXggaXNuYW4oKSB3aXRoIHN0ZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODg0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL09w dGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpPcHRpb246Om9wZXJhdG9yPT0pOgorCiAyMDE1LTA0 LTE2ICBKb3JkYW4gSGFyYmFuZCAgPGxqaGFyYkBnbWFpbC5jb20+CiAKICAgICAgICAgTnVtYmVy LnBhcnNlSW50IGlzIG5vdCA9PT0gZ2xvYmFsIHBhcnNlSW50IGluIG5pZ2h0bHkgcjE4MjY3Mwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmNwcAppbmRleCBhM2UwMzJmLi4z ZTUyMTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25z LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmNwcApAQCAt NDY4LDcgKzQ2OCw3IEBAIGJvb2wgT3B0aW9uOjpvcGVyYXRvcj09KGNvbnN0IE9wdGlvbiYgb3Ro ZXIpIGNvbnN0CiAgICAgY2FzZSBPcHRpb25zOjpUeXBlOjp1bnNpZ25lZFR5cGU6CiAgICAgICAg IHJldHVybiBtX2VudHJ5LnVuc2lnbmVkVmFsID09IG90aGVyLm1fZW50cnkudW5zaWduZWRWYWw7 CiAgICAgY2FzZSBPcHRpb25zOjpUeXBlOjpkb3VibGVUeXBlOgotICAgICAgICByZXR1cm4gKG1f ZW50cnkuZG91YmxlVmFsID09IG90aGVyLm1fZW50cnkuZG91YmxlVmFsKSB8fCAoaXNuYW4obV9l bnRyeS5kb3VibGVWYWwpICYmIGlzbmFuKG90aGVyLm1fZW50cnkuZG91YmxlVmFsKSk7CisgICAg ICAgIHJldHVybiAobV9lbnRyeS5kb3VibGVWYWwgPT0gb3RoZXIubV9lbnRyeS5kb3VibGVWYWwp IHx8IChzdGQ6OmlzbmFuKG1fZW50cnkuZG91YmxlVmFsKSAmJiBzdGQ6OmlzbmFuKG90aGVyLm1f ZW50cnkuZG91YmxlVmFsKSk7CiAgICAgY2FzZSBPcHRpb25zOjpUeXBlOjppbnQzMlR5cGU6CiAg ICAgICAgIHJldHVybiBtX2VudHJ5LmludDMyVmFsID09IG90aGVyLm1fZW50cnkuaW50MzJWYWw7 CiAgICAgY2FzZSBPcHRpb25zOjpUeXBlOjpvcHRpb25SYW5nZVR5cGU6CmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDE3NTkxOWUu LmU5YzQwYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X VEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTUtMDQtMTcgIE1pbGFuIENyaGEgIDxt Y3JoYUByZWRoYXQuY29tPgorCisgICAgICAgIFByZWZpeCBpc25hbigpIHdpdGggc3RkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4ODQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9TdG9wd2F0 Y2guaDoKKyAgICAgICAgKFdURjo6U3RvcHdhdGNoOjppc0FjdGl2ZSk6CisgICAgICAgIChXVEY6 OlN0b3B3YXRjaDo6c3RhcnQpOgorICAgICAgICAoV1RGOjpTdG9wd2F0Y2g6OnN0b3ApOgorICAg ICAgICAoV1RGOjpTdG9wd2F0Y2g6OmVsYXBzZWRUaW1lKToKKwogMjAxNS0wNC0xNiAgWXVzdWtl IFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBbRVM2XSBJbXBsZW1l bnQgU3ltYm9sLmZvciBhbmQgU3ltYm9sLmtleUZvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvU3RvcHdhdGNoLmggYi9Tb3VyY2UvV1RGL3d0Zi9TdG9wd2F0Y2guaAppbmRleCA2ZWRjNDZl Li5kZjUxYzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9TdG9wd2F0Y2guaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9TdG9wd2F0Y2guaApAQCAtNDQsNyArNDQsNyBAQCBwdWJsaWM6CiAKICAg ICBkb3VibGUgZWxhcHNlZFRpbWUoKTsKIAotICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdCB7IHJl dHVybiAhaXNuYW4obV9sYXN0U3RhcnRUaW1lKTsgfQorICAgIGJvb2wgaXNBY3RpdmUoKSBjb25z dCB7IHJldHVybiAhc3RkOjppc25hbihtX2xhc3RTdGFydFRpbWUpOyB9CiBwcml2YXRlOgogICAg IFN0b3B3YXRjaCgpIHsgcmVzZXQoKTsgfQogCkBAIC02MCwxNCArNjAsMTQgQEAgaW5saW5lIHZv aWQgU3RvcHdhdGNoOjpyZXNldCgpCiAKIGlubGluZSB2b2lkIFN0b3B3YXRjaDo6c3RhcnQoKQog ewotICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoaXNuYW4obV9sYXN0U3RhcnRUaW1lKSwgIlRyaWVk IHRvIHN0YXJ0IHRoZSBzdG9wd2F0Y2gsIGJ1dCBpdCBpcyBhbHJlYWR5IHJ1bm5pbmcuIik7Cisg ICAgQVNTRVJUX1dJVEhfTUVTU0FHRShzdGQ6OmlzbmFuKG1fbGFzdFN0YXJ0VGltZSksICJUcmll ZCB0byBzdGFydCB0aGUgc3RvcHdhdGNoLCBidXQgaXQgaXMgYWxyZWFkeSBydW5uaW5nLiIpOwog CiAgICAgbV9sYXN0U3RhcnRUaW1lID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CiB9 CiAKIGlubGluZSB2b2lkIFN0b3B3YXRjaDo6c3RvcCgpCiB7Ci0gICAgQVNTRVJUX1dJVEhfTUVT U0FHRSghaXNuYW4obV9sYXN0U3RhcnRUaW1lKSwgIlRyaWVkIHRvIHN0b3AgdGhlIHN0b3B3YXRj aCwgYnV0IGl0IGlzIG5vdCBydW5uaW5nLiIpOworICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIXN0 ZDo6aXNuYW4obV9sYXN0U3RhcnRUaW1lKSwgIlRyaWVkIHRvIHN0b3AgdGhlIHN0b3B3YXRjaCwg YnV0IGl0IGlzIG5vdCBydW5uaW5nLiIpOwogCiAgICAgbV9lbGFwc2VkVGltZSArPSBtb25vdG9u aWNhbGx5SW5jcmVhc2luZ1RpbWUoKSAtIG1fbGFzdFN0YXJ0VGltZTsKICAgICBtX2xhc3RTdGFy dFRpbWUgPSBOQU47CkBAIC03NSw3ICs3NSw3IEBAIGlubGluZSB2b2lkIFN0b3B3YXRjaDo6c3Rv cCgpCiAKIGlubGluZSBkb3VibGUgU3RvcHdhdGNoOjplbGFwc2VkVGltZSgpCiB7Ci0gICAgYm9v bCBzaG91bGRTdXNwZW5kID0gIWlzbmFuKG1fbGFzdFN0YXJ0VGltZSk7CisgICAgYm9vbCBzaG91 bGRTdXNwZW5kID0gIXN0ZDo6aXNuYW4obV9sYXN0U3RhcnRUaW1lKTsKICAgICBpZiAoc2hvdWxk U3VzcGVuZCkKICAgICAgICAgc3RvcCgpOwogCg==