34190 2010-01-26 16:48:43 -0800 [BREWMP] Remove COMPILE_ASSERT conflict with the underlying PLATFORM 2010-02-03 18:59:00 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 33564 0 skyul webkit-unassigned commit-queue eric oldest_to_newest 184829 0 skyul 2010-01-26 16:48:43 -0800 COMPILE_ASSERT conflicts with the underlying PLATFORM because it is defined both in WTF's Assertions.h and BREWMP's AEEClassIDs.h. Include "AEEClassIDs.h" in Assertions.h and undef COMPILE_ASSERT to avoid redefining COMPILE_ASSERT. 184830 1 47462 skyul 2010-01-26 16:52:32 -0800 Created attachment 47462 Remove COMPILE_ASSERT conflict 187484 2 47462 eric 2010-02-03 13:06:11 -0800 Comment on attachment 47462 Remove COMPILE_ASSERT conflict It seems strange to me to include AEEClassIDs.h I assume that's where COMPILE_ASSERT is defined? 187497 3 47462 commit-queue 2010-02-03 13:43:43 -0800 Comment on attachment 47462 Remove COMPILE_ASSERT conflict Clearing flags on attachment: 47462 Committed r54296: <http://trac.webkit.org/changeset/54296> 187498 4 commit-queue 2010-02-03 13:43:51 -0800 All reviewed patches have been landed. Closing bug. 187595 5 skyul 2010-02-03 18:59:00 -0800 (In reply to comment #2) > (From update of attachment 47462 [details]) > It seems strange to me to include AEEClassIDs.h > > I assume that's where COMPILE_ASSERT is defined? Yes. COMPILE_ASSERT is defined in AEEClassIDs.h. 47462 2010-01-26 16:52:32 -0800 2010-02-03 13:43:43 -0800 Remove COMPILE_ASSERT conflict COMPILE_ASSERT.patch text/plain 1459 skyul SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzODcyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMjYgIEt3YW5nIFl1 bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQlJFV01QXSBSZW1vdmUgQ09NUElMRV9BU1NFUlQgY29u ZmxpY3Qgd2l0aCB0aGUgdW5kZXJseWluZyBQTEFURk9STQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQxOTAKKworICAgICAgICBDT01QSUxFX0FTU0VS VCBjb25mbGljdHMgd2l0aCB0aGUgdW5kZXJseWluZyBQTEFURk9STSBiZWNhdXNlIGl0IGlzIGRl ZmluZWQKKyAgICAgICAgYm90aCBpbiBXVEYncyBBc3NlcnRpb25zLmggYW5kIEJSRVdNUCdzIEFF RUNsYXNzSURzLmguIEluY2x1ZGUgQUVFQ2xhc3NJRHMuaAorICAgICAgICBpbiBBc3NlcnRpb25z LmggYW5kIHVuZGVmIENPTVBJTEVfQVNTRVJUIHRvIGF2b2lkIHJlZGVmaW5pbmcgQ09NUElMRV9B U1NFUlQuCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5oOgorCiAyMDEwLTAxLTI2ICBTdGV2 ZSBGYWxrZW5idXJnICA8c2ZhbGtlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyIEh1bnQuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25zLmgJKHJldmlzaW9uIDUzODcy KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAt MTc5LDYgKzE3OSwxNCBAQCB2b2lkIFdURkxvZ1ZlcmJvc2UoY29uc3QgY2hhciogZmlsZSwgaW50 CiAjdW5kZWYgQVNTRVJUCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKEJSRVdNUCkKKy8qIEZJWE1F OiBXZSBpbmNsdWRlIHRoaXMgaGVyZSBvbmx5IHRvIGF2b2lkIGEgY29uZmxpY3Qgd2l0aCB0aGUg Q09NUElMRV9BU1NFUlQgbWFjcm8uICovCisjaW5jbHVkZSA8QUVFQ2xhc3NJRHMuaD4KKworLyog RklYTUU6IENoYW5nZSB0byB1c2Ugc29tZXRoaW5nIG90aGVyIHRoYW4gQ09NUElMRV9BU1NFUlQg dG8gYXZvaWQgdGhpcyBjb25mbGljdCB3aXRoIHRoZSB1bmRlcmx5aW5nIHBsYXRmb3JtICovCisj dW5kZWYgQ09NUElMRV9BU1NFUlQKKyNlbmRpZgorCiAjaWYgQVNTRVJUX0RJU0FCTEVECiAKICNk ZWZpbmUgQVNTRVJUKGFzc2VydGlvbikgKCh2b2lkKTApCg==