X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0518029cecf127dc5e792bb3fcd6781d46c0e0b1..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/hash.h?ds=sidebyside diff --git a/include/wx/hash.h b/include/wx/hash.h index 32789cdd78..3eb539e9d3 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -18,7 +18,7 @@ #if !wxUSE_STL #include "wx/object.h" #else - class WXDLLIMPEXP_BASE wxObject; + class WXDLLIMPEXP_FWD_BASE wxObject; #endif // the default size of the hash @@ -39,12 +39,12 @@ union wxHashKeyValue // for some compilers (AIX xlC), defining it as friend inside the class is not // enough, so provide a real forward declaration -class WXDLLIMPEXP_BASE wxHashTableBase; +class WXDLLIMPEXP_FWD_BASE wxHashTableBase; class WXDLLIMPEXP_BASE wxHashTableBase_Node { - friend class WXDLLIMPEXP_BASE wxHashTableBase; - typedef class WXDLLIMPEXP_BASE wxHashTableBase_Node _Node; + friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase; + typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node; public: wxHashTableBase_Node( long key, void* value, wxHashTableBase* table ); @@ -84,7 +84,7 @@ class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject #endif { - friend class WXDLLIMPEXP_BASE wxHashTableBase_Node; + friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node; public: typedef wxHashTableBase_Node Node; @@ -159,7 +159,7 @@ private: class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node { - friend class WXDLLIMPEXP_BASE wxHashTable; + friend class WXDLLIMPEXP_FWD_BASE wxHashTable; public: wxHashTable_Node( long key, void* value, wxHashTableBase* table ) @@ -287,7 +287,7 @@ private: // and this one does exactly the same thing but should be used inside the // library #define WX_DECLARE_EXPORTED_HASH(el, list, hash) \ - _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT) + _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE) #define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \ _WX_DECLARE_HASH(el, list, hash, class usergoo)