Changeset 169:ee067c376df2 in rrlib_util


Ignore:
Timestamp:
18.10.2018 15:18:36 (8 weeks ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
166:f256efc85099 (diff), 167:db24b1e80891 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Tags:
tip
Message:

Merge with 14.08

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • exception/tTraceableExceptionBase.cpp

    r127 r168  
    223223} 
    224224 
     225#ifndef NDEBUG 
    225226std::terminate_handler original_terminate = nullptr; 
    226227 
     
    245246  abort(); 
    246247} 
     248#endif 
    247249 
    248250} 
  • exception/tTraceableExceptionBase.cpp

    r167 r168  
    8383// Implementation 
    8484//---------------------------------------------------------------------- 
    85  
    86 #if __linux__ 
     85#ifndef __linux__ 
     86#define RRLIB_UTIL_EXCEPTION_DISABLE_TRACING 
     87#endif 
     88 
     89#ifndef RRLIB_UTIL_EXCEPTION_DISABLE_TRACING 
    8790namespace 
    8891{ 
     
    253256//---------------------------------------------------------------------- 
    254257tTraceableExceptionBase::tTraceableExceptionBase() : 
    255 #if defined(NDEBUG) || !__linux__ 
     258#if defined(NDEBUG) || defined(RRLIB_UTIL_EXCEPTION_DISABLE_TRACING) 
    256259  stack_trace_depth(0) 
    257260{} 
     
    282285  } 
    283286 
    284 #if __linux__ 
     287#ifndef RRLIB_UTIL_EXCEPTION_DISABLE_TRACING 
    285288  if (this->buffered_backtrace.empty()) 
    286289  { 
Note: See TracChangeset for help on using the changeset viewer.