aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Stack_Trace.cpp
diff options
context:
space:
mode:
authorclick <none@none>2010-11-04 05:30:29 +0100
committerclick <none@none>2010-11-04 05:30:29 +0100
commit9b16ee203f3f8e6e21c4864bd3308bf58c7b6800 (patch)
tree14950af01860fc520bbbd320c7ad81ef0281cbf3 /dep/acelite/ace/Stack_Trace.cpp
parent2604250c3c4efd93e9977f2eb72d6398a7a7bcb2 (diff)
Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
Diffstat (limited to 'dep/acelite/ace/Stack_Trace.cpp')
-rw-r--r--dep/acelite/ace/Stack_Trace.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/dep/acelite/ace/Stack_Trace.cpp b/dep/acelite/ace/Stack_Trace.cpp
index 3beb1c52f3e..6c04e192886 100644
--- a/dep/acelite/ace/Stack_Trace.cpp
+++ b/dep/acelite/ace/Stack_Trace.cpp
@@ -2,7 +2,7 @@
/**
* @file Stack_Trace.cpp
*
- * $Id: Stack_Trace.cpp 90041 2010-04-29 03:38:07Z cleeland $
+ * $Id: Stack_Trace.cpp 91286 2010-08-05 09:04:31Z johnnyw $
*
* @brief Encapsulate string representation of stack trace.
*
@@ -22,7 +22,7 @@
*
* If you add support for a new platform, please add a bullet to the
* above list with durable references to the origins of your code.
- *
+ *
*/
//=============================================================================
@@ -31,8 +31,6 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID (ace, Stack_Trace, "$Id: Stack_Trace.cpp 90041 2010-04-29 03:38:07Z cleeland $")
-
/*
This is ugly, simply because it's very platform-specific.
*/
@@ -122,7 +120,7 @@ struct ACE_Stack_Trace_stackstate
size_t starting_frame;
};
-//@TODO: Replace with a TSS-based pointer to avoid problems in multithreaded environs,
+//@TODO: Replace with a TSS-based pointer to avoid problems in multithreaded environs,
// or use a mutex to serialize access to this.
static ACE_Stack_Trace_stackstate* ACE_Stack_Trace_stateptr = 0;
@@ -509,7 +507,7 @@ typedef struct _dbghelp_functions
# pragma warning (push)
-# pragma warning (disable:4706)
+# pragma warning (disable:4706)
static bool load_dbghelp_library_if_needed (dbghelp_functions *pDbg)
{
//@TODO: See codeproject's StackWalker.cpp for the list of locations to
@@ -609,7 +607,7 @@ cs_operate(int (*func)(struct frame_state const *, void *), void *usrarg,
ZeroMemory (&fs.sf, sizeof (fs.sf));
fs.pDbg = &dbg;
emptyStack (); //Not sure what this should do, Chad?
-
+
CONTEXT c;
ZeroMemory (&c, sizeof (CONTEXT));
c.ContextFlags = CONTEXT_FULL;
@@ -711,7 +709,7 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset,
void
ACE_Stack_Trace::generate_trace (ssize_t, size_t)
{
-// Call determine_starting_frame() on HP aCC build to resolve declared
+// Call determine_starting_frame() on HP aCC build to resolve declared
// method never referenced warning.
#if defined (__HP_aCC)
size_t starting_frame = determine_starting_frame (0, 0);