aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linknx/files
diff options
context:
space:
mode:
authorDirk Opfer <dirk@do13.de>2010-05-16 17:52:21 +0200
committerDirk Opfer <dirk@do13.de>2010-08-03 13:47:42 +0200
commit2b61601cc8e3ede0b071da299591a6115d1df9db (patch)
tree8559f0d8d511c266304d450497387c16b882a44f /recipes/linknx/files
parent305940c1b6bf67cf13de084b30f8e5aaf700fc93 (diff)
downloadopenembedded-2b61601cc8e3ede0b071da299591a6115d1df9db.tar.gz
openembedded-2b61601cc8e3ede0b071da299591a6115d1df9db.tar.bz2
openembedded-2b61601cc8e3ede0b071da299591a6115d1df9db.zip
linknx: 0.0.1.26 -> 0.0.1.27
bump version number of cvs recipe
Diffstat (limited to 'recipes/linknx/files')
-rw-r--r--recipes/linknx/files/logger-initialisations.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/recipes/linknx/files/logger-initialisations.patch b/recipes/linknx/files/logger-initialisations.patch
deleted file mode 100644
index 857014ea79..0000000000
--- a/recipes/linknx/files/logger-initialisations.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: linknx/src/logger.h
-===================================================================
-RCS file: /cvsroot/linknx/linknx/linknx/src/logger.h,v
-retrieving revision 1.5
-diff -u -r1.5 logger.h
---- linknx/src/logger.h 8 Mar 2009 22:34:23 -0000 1.5
-+++ linknx/src/logger.h 17 May 2009 22:29:02 -0000
-@@ -132,7 +132,7 @@
- std::string cat_m;
- typedef std::pair<std::string ,Logger*> LoggerPair_t;
- typedef std::map<std::string ,Logger*> LoggerMap_t;
-- static LoggerMap_t loggerMap_m;
-+ static LoggerMap_t* getLoggerMap();
- static int level_m; // 10=DEBUG, 20=INFO, 30=NOTICE, 40=WARN, 50=ERROR,
- static bool timestamp_m;
- static std::ostream nullStream_m;
-Index: linknx/src/logger.cpp
-===================================================================
-RCS file: /cvsroot/linknx/linknx/linknx/src/logger.cpp,v
-retrieving revision 1.6
-diff -u -r1.6 logger.cpp
---- linknx/src/logger.cpp 12 Mar 2009 21:56:55 -0000 1.6
-+++ linknx/src/logger.cpp 17 May 2009 22:29:02 -0000
-@@ -118,7 +118,7 @@
-
- #include <ctime>
-
--Logger::LoggerMap_t Logger::loggerMap_m;
-+//Logger::LoggerMap_t Logger::loggerMap_m;
- int Logger::level_m;
- bool Logger::timestamp_m;
- NullStreamBuf Logger::nullStreamBuf_m;
-@@ -157,14 +157,23 @@
- pConfig->SetAttribute("level", level_m);
- }
-
-+Logger::LoggerMap_t* Logger::getLoggerMap() {
-+ // This static local is used to avoid problems with
-+ // initialization order of static object present in
-+ // different compilation units
-+ static LoggerMap_t* loggerMap = new LoggerMap_t();
-+ return loggerMap;
-+}
-+
- Logger& Logger::getInstance(const char* cat) {
-- LoggerMap_t::iterator it = loggerMap_m.find(cat);
-+ LoggerMap_t* map = getLoggerMap();
-+ LoggerMap_t::iterator it = map->find(cat);
- Logger* logger;
-- if (it != loggerMap_m.end())
-+ if (it != map->end())
- logger = it->second;
- else {
- logger = new Logger(cat);
-- loggerMap_m.insert(LoggerPair_t(cat, logger));
-+ map->insert(LoggerPair_t(cat, logger));
- }
- return *(logger);
- }