Commit 8dda77b5 authored by Davis King's avatar Davis King

Made the stack trace code a little cleaner

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402332
parent 62aa6ba7
...@@ -69,7 +69,7 @@ namespace dlib ...@@ -69,7 +69,7 @@ namespace dlib
while (get_dlib_stack_trace_stack().data().move_next()) while (get_dlib_stack_trace_stack().data().move_next())
{ {
stack_tracer_data data = get_dlib_stack_trace_stack().data().element(); stack_tracer_data data = get_dlib_stack_trace_stack().data().element();
sout << data.file_name << ":" << data.line_number << "\n " << data.funct_name; sout << data.file_name << ":" << data.line_number << "\n " << data.funct_name << "\n";
} }
return sout.str(); return sout.str();
} }
......
...@@ -54,7 +54,10 @@ ...@@ -54,7 +54,10 @@
// only setup the stack trace stuff if the asserts are enabled (which happens in debug mode // only setup the stack trace stuff if the asserts are enabled (which happens in debug mode
// basically). Also, this stuff doesn't work if you use NO_MAKEFILE // basically). Also, this stuff doesn't work if you use NO_MAKEFILE
#if defined(DLIB_ENABLE_STACK_TRACE) && !defined(NO_MAKEFILE) #if defined(DLIB_ENABLE_STACK_TRACE)
#ifdef NO_MAKEFILE
#error "You can't use the dlib stack trace stuff and NO_MAKEFILE at the same time"
#endif
namespace dlib namespace dlib
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment