mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:30:10 +02:00
parent e6e7bed4b6 01acc7d9ae
commit 59c83b2c70
21 changed files with 264 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/helpers.cpp
View File

@@ -48,6 +48,7 @@
#include "debug.h"
#include <driver/fontrenderer.h>
#include <global.h>
#include <driver/fontrenderer.h>
#include <system/helpers.h>
#include <gui/update_ext.h>
using namespace std;
@@ -1259,6 +1260,7 @@ std::vector<std::string> split(const std::string &s, char delim)
return vec;
}
#if __cplusplus < 201103L
std::string to_string(int i)
{
std::stringstream s;
@@ -1300,6 +1302,7 @@ std::string to_string(unsigned long long i)
s << i;
return s.str();
}
#endif
/**
* C++ version 0.4 std::string style "itoa":