added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 )
|
||||
|
Reference in New Issue
Block a user