Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define USE_ONLY_STATIC_WEAKREF for g++ < 3.3 too (3.2 is reported not to work otherwise)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-19 09:58:49 +00:00
parent 69fb2f9749
commit 014b109195
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/weakref.h
View File

@@ -14,15 +14,17 @@
#include "wx/tracker.h" #include "wx/tracker.h"
// Some compilers (VC6, Borland, otehrs?) have problem with template specialization. // Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization.
// However, this is only used for optimization purposes (a smaller wxWeakRef pointer) // However, this is only used for optimization purposes (a smaller wxWeakRef pointer)
// (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall // (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall
// back to the non-optimal case, where we use a the same type of weak ref (static one) // back to the non-optimal case, where we use a the same type of weak ref (static one)
// in all cases. See defs.h for various setting these defines depending on compiler. // in all cases. See defs.h for various setting these defines depending on compiler.
#if !defined(HAVE_PARTIAL_SPECIALIZATION) || !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) #if !defined(HAVE_PARTIAL_SPECIALIZATION) || \
#define USE_ONLY_STATIC_WEAKREF !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) || \
#endif (defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 3))
#define USE_ONLY_STATIC_WEAKREF
#endif
#ifndef USE_ONLY_STATIC_WEAKREF #ifndef USE_ONLY_STATIC_WEAKREF
@@ -215,13 +217,13 @@ public:
Assign(pobj); Assign(pobj);
} }
// We need this copy ctor, since otherwise a default compiler (binary) copy // We need this copy ctor, since otherwise a default compiler (binary) copy
// happens (if embedded as an object member). // happens (if embedded as an object member).
wxWeakRef(const wxWeakRef<T>& wr) wxWeakRef(const wxWeakRef<T>& wr)
{ {
Assign(wr.get()); Assign(wr.get());
} }
template <class TDerived> template <class TDerived>
wxWeakRef<T>& operator=(TDerived* pobj) wxWeakRef<T>& operator=(TDerived* pobj)
{ {
@@ -265,18 +267,18 @@ public:
{ {
Assign(wr.get()); Assign(wr.get());
} }
virtual ~wxWeakRefDynamic() { Release(); } virtual ~wxWeakRefDynamic() { Release(); }
// Smart pointer functions // Smart pointer functions
T& operator*() const { wxASSERT(m_pobj); return *m_pobj; } T& operator*() const { wxASSERT(m_pobj); return *m_pobj; }
T* operator->() const { wxASSERT(m_pobj); return m_pobj; } T* operator->() const { wxASSERT(m_pobj); return m_pobj; }
T* get() const { return m_pobj; } T* get() const { return m_pobj; }
operator T* () const { return m_pobj; } operator T* () const { return m_pobj; }
T* operator = (T* pobj) { Assign(pobj); return m_pobj; } T* operator = (T* pobj) { Assign(pobj); return m_pobj; }
// Assign from another weak ref, point to same object // Assign from another weak ref, point to same object
T* operator = (const wxWeakRef<T> &wr) { Assign( wr.get() ); return m_pobj; } T* operator = (const wxWeakRef<T> &wr) { Assign( wr.get() ); return m_pobj; }