fix build for Windows UWP #69
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ksooo
reviewed
Nov 11, 2017
src/pvrclient-nextpvr.cpp
Outdated
| while (true) | ||
| { | ||
| subend = search(substart, s.end(), delim.begin(), delim.end()); | ||
| CStdString temp(substart, subend); | ||
| std::string temp(substart, subend); |
src/pvrclient-nextpvr.cpp
Outdated
| CStdString pinMD5 = PVRXBMC::XBMC_MD5::GetMD5(g_szPin); | ||
| pinMD5.ToLower(); | ||
| std::string pinMD5 = PVRXBMC::XBMC_MD5::GetMD5(g_szPin); | ||
| StringUtils::ToLower(pinMD5); |
src/pvrclient-nextpvr.cpp
Outdated
|
|
||
| // calculate combined MD5 | ||
| CStdString combinedMD5; | ||
| std::string combinedMD5; |
src/pvrclient-nextpvr.cpp
Outdated
| combinedMD5.append(":"); | ||
| combinedMD5.append(pinMD5); | ||
| combinedMD5.append(":"); | ||
| combinedMD5.append(salt); | ||
|
|
||
| // get digest | ||
| CStdString md5 = PVRXBMC::XBMC_MD5::GetMD5(combinedMD5); | ||
| std::string md5 = PVRXBMC::XBMC_MD5::GetMD5(combinedMD5); |
src/pvrclient-nextpvr.cpp
Outdated
|
|
||
| // login session | ||
| CStdString loginResponse; | ||
| std::string loginResponse; |
src/pvrclient-nextpvr.cpp
Outdated
| { | ||
| // check server version | ||
| CStdString settings; | ||
| std::string settings; |
src/pvrclient-nextpvr.cpp
Outdated
| @@ -1078,13 +1081,13 @@ int cPVRClientNextPVR::GetNumTimers(void) | |||
|
|
|||
| PVR_ERROR cPVRClientNextPVR::GetTimers(ADDON_HANDLE handle) | |||
| { | |||
| CStdString response; | |||
| std::string response; | |||
| @@ -38,6 +39,8 @@ | |||
| #define MAXINT64 ULONG_MAX | |||
| #endif | |||
|
|
|||
| #include <algorithm> | |||
There was a problem hiding this comment.
For what do you need this header?
There was a problem hiding this comment.
pvr.nextpvr/src/pvrclient-nextpvr.cpp
Line 161 in 0df87de
algorithm was included by p8-platform/util/StdString.h
There was a problem hiding this comment.
I hate people putting "using namespace std;" into sources. :-/
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.