diff options
| author | Garrett Brown <garbearucla@gmail.com> | 2013-12-15 22:01:46 -0800 |
|---|---|---|
| committer | Garrett Brown <garbearucla@gmail.com> | 2013-12-15 22:01:55 -0800 |
| commit | 66e8eb2e9c0c9d7f044850ddd5e3b8e6aeb14925 (patch) | |
| tree | 1e68cc3e8b456238054e8240bfeab306b8c472fc | |
| parent | decc3fbdcc52b92f84841322b73a7396f2efabd0 (diff) | |
Use std::string instead of CStdString in URL.cpp
I'm really glad I caught this. Some unlucky fellow begrudgingly doing a find-and-replace for CStdString has just been spared a small headache.
| -rw-r--r-- | project/cmake/xbmc-config.cmake | 5 | ||||
| -rw-r--r-- | xbmc/URL.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/project/cmake/xbmc-config.cmake b/project/cmake/xbmc-config.cmake new file mode 100644 index 0000000000..5e2927b55d --- /dev/null +++ b/project/cmake/xbmc-config.cmake @@ -0,0 +1,5 @@ +SET(XBMC_INCLUDE_DIR /usr/local/include) +LIST(APPEND CMAKE_MODULE_PATH /usr/local/lib/xbmc) +ADD_DEFINITIONS(-DTARGET_POSIX -DTARGET_LINUX -D_LINUX) + +include(xbmc-addon-helpers) diff --git a/xbmc/URL.cpp b/xbmc/URL.cpp index 99fc6c2042..07154fbd1a 100644 --- a/xbmc/URL.cpp +++ b/xbmc/URL.cpp @@ -723,10 +723,10 @@ void CURL::Decode(CStdString& strURLData) { if (i < strURLData.size() - 2) { - CStdString strTmp; + std::string strTmp; strTmp.assign(strURLData.substr(i + 1, 2)); int dec_num=-1; - sscanf(strTmp,"%x",(unsigned int *)&dec_num); + sscanf(strTmp.c_str(), "%x", (unsigned int *)&dec_num); if (dec_num<0 || dec_num>255) strResult += kar; else |