diff mbox series

[oe,meta-multimedia,4/9] kodi: Use std namespace for string objects

Message ID 20170808214800.39621-4-raj.khem@gmail.com
State New
Headers show
Series [oe,meta-oe,1/9] php7: upgrade to 7.1.7 | expand

Commit Message

Khem Raj Aug. 8, 2017, 9:47 p.m. UTC
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...ilesystems-string-is-in-the-std-namespace.patch | 88 ++++++++++++++++++++++
 .../recipes-mediacenter/kodi/kodi_17.bb            |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch

-- 
2.14.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch
new file mode 100644
index 000000000..7f8926df3
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch
@@ -0,0 +1,88 @@ 
+From 4f2448129128f12fcf3a232c6801eb687c742947 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 1 Aug 2017 20:04:33 -0700
+Subject: [PATCH] filesystems: string is in the std namespace
+
+Use std::string instead of string
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
+index cfcc7c64ed..b0f676ae1a 100644
+--- a/xbmc/filesystem/FTPParse.cpp
++++ b/xbmc/filesystem/FTPParse.cpp
+@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
+   m_time = 0;
+ }
+ 
+-string CFTPParse::getName()
++std::string CFTPParse::getName()
+ {
+   return m_name;
+ }
+@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
+   return m_time;
+ }
+ 
+-void CFTPParse::setTime(string str)
++void CFTPParse::setTime(std::string str)
+ {
+   /* Variables used to capture patterns via the regexes */
+-  string month;
+-  string day;
+-  string year;
+-  string hour;
+-  string minute;
+-  string second;
+-  string am_or_pm;
++  std::string month;
++  std::string day;
++  std::string year;
++  std::string hour;
++  std::string minute;
++  std::string second;
++  std::string am_or_pm;
+ 
+   /* time struct used to set the time_t variable */
+   struct tm time_struct = {};
+@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
+   return day_of_week;
+ }
+ 
+-int CFTPParse::FTPParse(string str)
++int CFTPParse::FTPParse(std::string str)
+ {
+   /* Various variable to capture patterns via the regexes */
+-  string permissions;
+-  string link_count;
+-  string owner;
+-  string group;
+-  string size;
+-  string date;
+-  string name;
+-  string type;
+-  string stuff;
+-  string facts;
+-  string version;
+-  string file_id;
++  std::string permissions;
++  std::string link_count;
++  std::string owner;
++  std::string group;
++  std::string size;
++  std::string date;
++  std::string name;
++  std::string type;
++  std::string stuff;
++  std::string facts;
++  std::string version;
++  std::string file_id;
+ 
+   /* Regex for standard Unix listing formats */
+   pcrecpp::RE unix_re("^([-bcdlps])" // type
+-- 
+2.13.3
+
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
index 5a9fa9801..790a12e78 100644
--- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
@@ -79,6 +79,7 @@  SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \
            file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \
            file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \
            file://0001-change-order-of-detecting-libegl-and-libgles2.patch \
+           file://0013-filesystems-string-is-in-the-std-namespace.patch \
 "
 
 SRC_URI_append_libc-musl = " \