Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Helpers/MemDebug.hpp

    rf0f1cc r6d6b54  
    2121 * your sourcefiles.
    2222 */
     23#ifndef NDEBUG
     24#ifndef NO_MEMDEBUG
    2325
    24 // Set all flags in a way that makes sense
    25 
    26 // NDEBUG implies NO_MEMDEBUG
    27 #ifdef NDEBUG
    28 # ifndef NO_MEMDEBUG
    29 #   define NO_MEMDEBUG
    30 # endif
     26#ifndef MEMDEBUG
     27#define MEMDEBUG
    3128#endif
    32 
    33 // NO_MEMDEBUG and MEMDEBUG are mutually exclusive, but at least one must be set
    34 #ifdef NO_MEMDEBUG
    35 # ifdef MEMDEBUG
    36 #   undef MEMDEBUG
    37 # endif
    38 #else
    39 # ifndef MEMDEBUG
    40 #   define MEMDEBUG
    41 # endif
    42 #endif
    43 
    44 #ifdef MEMDEBUG
    4529
    4630#include <new>
    … …  
    4933// to be loaded before the define
    5034#include <string>
    51 #include <boost/optional.hpp>
    5235#include <boost/shared_ptr.hpp>
    5336#include <boost/function.hpp>
    … …  
    9982#endif
    10083
    101 #else
     84#endif
     85#endif
     86
     87
     88#ifdef NDEBUG
     89#undef MEMDEBUG
     90#endif
     91
     92#ifndef MEMDEBUG
    10293// memory debugging was disabled
    10394
    … …  
    112103
    113104#endif
    114 
    115 
    116105#endif /* MEMDEBUG_HPP_ */
Note: See TracChangeset for help on using the changeset viewer.