From ba29e50a41a4d4ab93b2e9da21af5afa4d802e4d Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 18 Jan 2012 15:19:08 +0400 Subject: [PATCH] edvbstring: change convertDVBUTF8 to stringDVBUTF8 to prevent overloading with implicit convertion from char Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f044899756215653ed8a208c722482234aec99b1 Author: [CST] Focus Date: 2012-01-18 (Wed, 18 Jan 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/sectionsd/edvbstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sectionsd/edvbstring.h b/src/sectionsd/edvbstring.h index a01101ab2..0554adb9c 100644 --- a/src/sectionsd/edvbstring.h +++ b/src/sectionsd/edvbstring.h @@ -6,7 +6,7 @@ int isUTF8(const std::string &string); std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid = 0); 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); }