An Overlay-based
Virtual Network Substrate
SpoVNet

Ignore:
Timestamp:
Aug 22, 2012, 2:09:00 PM (6 years ago)
Author:
s_taenzer@…
Message:

Merge CMake branch into trunk

Location:
source
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • source

    • Property svn:ignore deleted
  • source/ariba

    • Property svn:ignore deleted
  • source/ariba/utility

    • Property svn:ignore deleted
  • source/ariba/utility/logging

    • Property svn:ignore deleted
  • source/ariba/utility/logging/Logging.h

    r9894 r10700  
    4444#include "ariba/config.h"
    4545
    46 #ifdef HAVE_LOG4CXX_LOGGER_H
     46#ifdef HAVE_LOG4CXX
    4747        #include <log4cxx/logger.h>
    4848        #include <log4cxx/basicconfigurator.h>
    49 #endif // HAVE_LOG4CXX_LOGGER_H
     49#endif // HAVE_LOG4CXX
    5050
    5151#ifdef LOGCOLORS
     
    6464
    6565
    66 #ifdef HAVE_LOG4CXX_LOGGER_H
     66#ifdef HAVE_LOG4CXX
    6767
    6868  #define use_logging_h(x) \
     
    8989  #define logging_classlevel_error(x) {log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(#x)); if(logger != NULL) logger->setLevel(log4cxx::Level::getError()); }
    9090
    91 #else // HAVE_LOG4CXX_LOGGER_H
     91#else // HAVE_LOG4CXX
    9292
    9393  #define use_logging_h(x)
     
    115115  #define logging_classlevel_error(x) {std::cout << "individual class logging only available with log4cxx library" << std::endl;}
    116116
    117 #endif // HAVE_LOG4CXX_LOGGER_H
     117#endif // HAVE_LOG4CXX
    118118
    119119#endif //LOGGING_H__
Note: See TracChangeset for help on using the changeset viewer.