Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1363 from G10h4ck/jsonapi

Browse source 
New cross-platform target retroshare-service
This commit is contained in:
G10h4ck 2018-10-16 16:06:09 +02:00 • committed by GitHub
commit 03cdd6c7b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2758 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/util/cxx11retrocompat.h
View file

@ -21,7 +21,7 @@
*******************************************************************************/
#pragma once
#ifdef __GNUC__
#if defined(__GNUC__) && !defined(__clang__)
# define GCC_VERSION (__GNUC__*10000+__GNUC_MINOR__*100+__GNUC_PATCHLEVEL__)
# if GCC_VERSION < 40700
# define override
@ -30,4 +30,4 @@
# if GCC_VERSION < 40600
# define nullptr NULL
# endif // GCC_VERSION < 40600
#endif //defined GNUC
#endif // defined(__GNUC__) && !defined(__clang__)

4
libretroshare/src/util/rsurl.cc
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//#include "util/rsurl.h"
#include "rsurl.h"
#include <cstdio>
@ -245,7 +245,7 @@ RsUrl& RsUrl::setFragment(const std::string& fragment)
if(str[i] == '%' && i < boundary)
{
decoded << static_cast<char>(stoi(str.substr(++i, 2), 0, 16));
decoded << static_cast<char>(std::stoi(str.substr(++i, 2), 0, 16));
++i;
}
else decoded << str[i];