vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Tue 
Jun 23 13:05:59 2015 +0200| [d0c37c2e94f0a473613b4463b3e2755f998f28cd] | 
committer: Jean-Baptiste Kempf

contrib/sidplay: fix openmode patch

_Ios_Openmode is an implementation detail of the GNU c++ stdlib whereas 
ios_base::openmode is the portable way to go

(cherry picked from commit 56b775d94fa351d797784f7f67a4bc78019111e9)
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d0c37c2e94f0a473613b4463b3e2755f998f28cd
---

 contrib/src/sidplay2/sidplay2-openmode.patch |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/sidplay2/sidplay2-openmode.patch 
b/contrib/src/sidplay2/sidplay2-openmode.patch
index 80a8e27..6e12d57 100644
--- a/contrib/src/sidplay2/sidplay2-openmode.patch
+++ b/contrib/src/sidplay2/sidplay2-openmode.patch
@@ -7,7 +7,7 @@
  
      // This sucks big time
 -    openmode createAtrr = std::ios::in;
-+    std::_Ios_Openmode createAtrr = std::ios::in;
++    std::ios_base::openmode createAtrr = std::ios::in;
  #ifdef HAVE_IOS_NOCREATE
      createAtrr |= std::ios::nocreate;
  #endif
@@ -16,7 +16,7 @@
      {
          // Open binary output file stream.
 -        openmode createAttr = std::ios::out;
-+        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
  #if defined(HAVE_IOS_BIN)
          createAttr |= std::ios::bin;
  #else
@@ -25,7 +25,7 @@
      {
          // Open ASCII output file stream.
 -        openmode createAttr = std::ios::out;
-+        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
          if ( overWriteFlag )
              createAttr |= std::ios::trunc;
          else
@@ -34,7 +34,7 @@
      {
          // Open binary output file stream.
 -        openmode createAttr = std::ios::out;
-+        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
  #if defined(HAVE_IOS_BIN)
          createAttr |= std::ios::bin;
  #else

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to