diff options
| author | Arne Morten Kvarving <cptspiff@gmail.com> | 2014-06-25 16:30:38 +0200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-07-14 08:33:02 +1200 |
| commit | 5c1e648026166369ada280a0fdf32f22bea0d01b (patch) | |
| tree | 5fc9bed614814f15bb7110ca4bd33dc4efe3c6fc | |
| parent | b997b621426386036c6f7c9e9d7411aa44627766 (diff) | |
[stdstring] get rid of CStdString in common/
| -rw-r--r-- | xbmc/commons/Exception.h | 3 | ||||
| -rw-r--r-- | xbmc/commons/ilog.cpp | 5 | ||||
| -rw-r--r-- | xbmc/threads/Thread.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/xbmc/commons/Exception.h b/xbmc/commons/Exception.h index 0d4f5140bd..a6be3037ce 100644 --- a/xbmc/commons/Exception.h +++ b/xbmc/commons/Exception.h @@ -25,7 +25,6 @@ // it wont cause a linker circular dependency since it's just // a header. #include "utils/StringUtils.h" -#include "utils/StdString.h" //--------------------------------------------------------- #include "ilog.h" @@ -58,7 +57,7 @@ namespace XbmcCommons private: std::string classname; - CStdString message; + std::string message; protected: static ILogger* logger; diff --git a/xbmc/commons/ilog.cpp b/xbmc/commons/ilog.cpp index 194faa8952..36ec535f87 100644 --- a/xbmc/commons/ilog.cpp +++ b/xbmc/commons/ilog.cpp @@ -19,14 +19,13 @@ */ #include "commons/ilog.h" -#include "utils/StdString.h" #include "utils/StringUtils.h" namespace XbmcCommons { void ILogger::Log(int loglevel, const char *format, ... ) { - CStdString strData; + std::string strData; strData.reserve(16384); va_list va; @@ -34,6 +33,6 @@ namespace XbmcCommons strData = StringUtils::FormatV(format,va); va_end(va); - log(loglevel, strData); + log(loglevel, strData.c_str()); } } diff --git a/xbmc/threads/Thread.cpp b/xbmc/threads/Thread.cpp index 911b40cfd3..b7343751c0 100644 --- a/xbmc/threads/Thread.cpp +++ b/xbmc/threads/Thread.cpp @@ -25,6 +25,7 @@ #include "threads/ThreadLocal.h" #include "threads/SingleLock.h" #include "commons/Exception.h" +#include <stdlib.h> #define __STDC_FORMAT_MACROS #include <inttypes.h> |