A better fix for wxHash{Map,Set} with g++ 4.7.
This reverts r70556, i.e. removes the scope operators added by it to all WX_DECLARE_HASH_{MAP,SET} macros, and implements a workaround for the problem due to the use of empty base class optimization in g++ 4.7 standard library implementations inside the macros themselves by prepending the hasher and comparator classes with explicit "struct". git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -107,7 +107,7 @@ class wxXmlResourceDataRecords : public wxVector<wxXmlResourceDataRecord*>
|
||||
// this is a class so that it can be forward-declared
|
||||
};
|
||||
|
||||
WX_DECLARE_HASH_SET_PTR(int, ::wxIntegerHash, ::wxIntegerEqual, wxHashSetInt);
|
||||
WX_DECLARE_HASH_SET_PTR(int, wxIntegerHash, wxIntegerEqual, wxHashSetInt);
|
||||
|
||||
class wxIdRange // Holds data for a particular rangename
|
||||
{
|
||||
|
Reference in New Issue
Block a user