mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
edvbstring: change convertDVBUTF8 to stringDVBUTF8 to prevent overloading with implicit convertion from char
Origin commit data
------------------
Branch: ni/coolstream
Commit: f044899756
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-18 (Wed, 18 Jan 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -6,7 +6,7 @@ int isUTF8(const std::string &string);
|
|||||||
std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid = 0);
|
std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid = 0);
|
||||||
int readEncodingFile();
|
int readEncodingFile();
|
||||||
|
|
||||||
inline std::string convertDVBUTF8(const std::string &string, int table=0, int tsidonid=0)
|
inline std::string stringDVBUTF8(const std::string &string, int table=0, int tsidonid=0)
|
||||||
{
|
{
|
||||||
return convertDVBUTF8((const char*)string.c_str(), string.length(), table, tsidonid);
|
return convertDVBUTF8((const char*)string.c_str(), string.length(), table, tsidonid);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user