Resolve GCC's 'type-punned pointer will break strict-aliasing rules' warning by break...

[wxWidgets.git] / include / wx / stackwalk.h

diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h
index 144dbd8e6d2288fa6c47d511cdf3196b90f9fb74..3fe444ae662195c38d57735fa4299c8f7ad6ce1b 100644 (file)
--- a/include/wx/stackwalk.h
+++ b/include/wx/stackwalk.h
@@ -18,6 +18,8 @@
 
 class WXDLLIMPEXP_FWD_BASE wxStackFrame;
 
+#define wxSTACKWALKER_MAX_DEPTH       (200)
+
 // ----------------------------------------------------------------------------
 // wxStackFrame: a single stack level
 // ----------------------------------------------------------------------------
@@ -27,7 +29,7 @@ class WXDLLIMPEXP_BASE wxStackFrameBase
 private:
     // put this inline function here so that it is defined before use
     wxStackFrameBase *ConstCast() const
-        { return wx_const_cast(wxStackFrameBase *, this); }
+        { return const_cast<wxStackFrameBase *>(this); }
 
 public:
     wxStackFrameBase(size_t level, void *address = NULL)
@@ -130,12 +132,14 @@ public:
     // number of them (this can be useful when Walk() is called from some known
     // location and you don't want to see the first few frames anyhow; also
     // notice that Walk() frame itself is not included if skip >= 1)
-    virtual void Walk(size_t skip = 1, size_t maxDepth = 200) = 0;
+    virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0;
 
+#if wxUSE_ON_FATAL_EXCEPTION
     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()
-    virtual void WalkFromException() = 0;
+    virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0;
+#endif // wxUSE_ON_FATAL_EXCEPTION
 
 protected:
     // this function must be overrided to process the given frame