Changeset 81:7286ffe33a97 in rrlib_logging


Ignore:
Timestamp:
16.01.2012 17:30:47 (8 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Transplant:
6a47ce39aef5d4e052178f7320014ad41effc8de
Message:

Fixed a few inconsistencies

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configuration/tDomainRegistry.cpp

    r76 r81  
    191191  { 
    192192    std::stringstream message; 
    193     message << "'" << filename << "' is not in RRLIB_LOG_PATH"; 
     193    message << "'" << filename << "' is not in RRLIB_LOGGING_PATH"; 
    194194    throw std::runtime_error(message.str()); 
    195195  } 
  • messages.h

    r78 r81  
    102102 * \param args     The data to be put into the underlying stream 
    103103 */ 
    104 #define RRLIB_LOG_PRINT_TO(domain_name, level, args...) \ 
    105   do \ 
    106   { \ 
    107     if ((level) <= rrlib::logging::eLL_DEBUG) \ 
    108     { \ 
    109       __RRLIB_LOG_PRINT__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     104#define RRLIB_LOG_PRINT_TO(domain, level, args...) \ 
     105  do \ 
     106  { \ 
     107    if ((level) <= rrlib::logging::eLL_DEBUG) \ 
     108    { \ 
     109      __RRLIB_LOG_PRINT__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    110110    } \ 
    111111  } while (0) \ 
     
    131131 * \param args     The data to be put into the underlying stream 
    132132 */ 
    133 #define RRLIB_LOG_PRINT_STATIC_TO(domain_name, level, args...) \ 
    134   do \ 
    135   { \ 
    136     if ((level) <= rrlib::logging::eLL_DEBUG) \ 
    137     { \ 
    138       __RRLIB_LOG_PRINT_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     133#define RRLIB_LOG_PRINT_STATIC_TO(domain, level, args...) \ 
     134  do \ 
     135  { \ 
     136    if ((level) <= rrlib::logging::eLL_DEBUG) \ 
     137    { \ 
     138      __RRLIB_LOG_PRINT_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    139139    } \ 
    140140  } while (0) \ 
     
    160160 * \param args     The format string for printf and the optional arguments to be printed 
    161161 */ 
    162 #define RRLIB_LOG_PRINTF_TO(domain_name, level, args...) \ 
    163   do \ 
    164   { \ 
    165     if ((level) <= rrlib::logging::eLL_DEBUG) \ 
    166     { \ 
    167       __RRLIB_LOG_PRINTF__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     162#define RRLIB_LOG_PRINTF_TO(domain, level, args...) \ 
     163  do \ 
     164  { \ 
     165    if ((level) <= rrlib::logging::eLL_DEBUG) \ 
     166    { \ 
     167      __RRLIB_LOG_PRINTF__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    168168    } \ 
    169169  } while (0) \ 
     
    189189 * \param args     The format string for printf and the optional arguments to be printed 
    190190 */ 
    191 #define RRLIB_LOG_PRINTF_STATIC_TO(domain_name, level, args...) \ 
    192   do \ 
    193   { \ 
    194     if ((level) <= rrlib::logging::eLL_DEBUG) \ 
    195     { \ 
    196       __RRLIB_LOG_PRINTF_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     191#define RRLIB_LOG_PRINTF_STATIC_TO(domain, level, args...) \ 
     192  do \ 
     193  { \ 
     194    if ((level) <= rrlib::logging::eLL_DEBUG) \ 
     195    { \ 
     196      __RRLIB_LOG_PRINTF_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    197197    } \ 
    198198  } while (0) \ 
     
    214214 * \param args     The data to be put into the underlying stream 
    215215 */ 
    216 #define RRLIB_LOG_PRINT_TO(domain_name, level, args...) \ 
    217   __RRLIB_LOG_PRINT__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     216#define RRLIB_LOG_PRINT_TO(domain, level, args...) \ 
     217  __RRLIB_LOG_PRINT__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    218218    
    219219/*! Macro to print messages using stream semantics static context 
     
    231231 * \param args     The data to be put into the underlying stream 
    232232 */ 
    233 #define RRLIB_LOG_PRINT_STATIC_TO(domain_name, level, args...) \ 
    234   __RRLIB_LOG_PRINT_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     233#define RRLIB_LOG_PRINT_STATIC_TO(domain, level, args...) \ 
     234  __RRLIB_LOG_PRINT_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    235235    
    236236/*! Macro to print messages using printf semantics 
     
    248248 * \param args     The format string for printf and the optional arguments to be printed 
    249249 */ 
    250 #define RRLIB_LOG_PRINTF_TO(domain_name, level, args...) \ 
    251   __RRLIB_LOG_PRINTF__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     250#define RRLIB_LOG_PRINTF_TO(domain, level, args...) \ 
     251  __RRLIB_LOG_PRINTF__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    252252    
    253253/*! Macro to print messages using printf semantics from static context 
     
    265265 * \param args     The format string for printf and the optional arguments to be printed 
    266266 */ 
    267 #define RRLIB_LOG_PRINTF_STATIC_TO(domain_name, level, args...) \ 
    268   __RRLIB_LOG_PRINTF_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain_name), level, args) \ 
     267#define RRLIB_LOG_PRINTF_STATIC_TO(domain, level, args...) \ 
     268  __RRLIB_LOG_PRINTF_STATIC__(rrlib::logging::GetConfiguration(__FILE__, #domain), level, args) \ 
    269269    
    270270#endif 
Note: See TracChangeset for help on using the changeset viewer.