From 1ff30e55da7cc4a94ccb583a4e6c55dd8b04b31a Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Fri, 11 Sep 2015 19:59:20 +0900
Subject: [PATCH] Revert "Stop exporting std::string and std::wstring in a
 public header."

This reverts commit 0e981adcc6daee17eaea6beda92bc2ce320363e8.
---
 taglib/toolkit/tfilestream.cpp | 8 ++++----
 taglib/toolkit/tiostream.cpp   | 8 ++++----
 taglib/toolkit/tiostream.h     | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 5705a5b3..882b3cdc 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -56,10 +56,10 @@ namespace
   {
     const DWORD access = readOnly ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE);
 
-    if(path.wstr()[0] != L'\0')
-      return CreateFileW(path.wstr(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    else if(path.str()[0] != '\0')
-      return CreateFileA(path.str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+    if(!path.wstr().empty())
+      return CreateFileW(path.wstr().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+    else if(!path.str().empty())
+      return CreateFileA(path.str().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
     else
       return InvalidFileHandle;
   }
diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
index 6c1ed6f7..80570cab 100644
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -129,14 +129,14 @@ FileName &FileName::operator=(const FileName &name)
   return *this;
 }
 
-const wchar_t *FileName::wstr() const
+const std::wstring &FileName::wstr() const
 {
-  return d->data->wname.c_str();
+  return d->data->wname;
 }
 
-const char *FileName::str() const
+const std::string &FileName::str() const
 {
-  return d->data->name.c_str();
+  return d->data->name;
 }
 
 String FileName::toString() const
diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index d0aa8877..e856f765 100644
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -46,8 +46,8 @@ namespace TagLib {
 
     FileName &operator=(const FileName &name);
 
-    const wchar_t *wstr() const;
-    const char *str() const;
+    const std::wstring &wstr() const;
+    const std::string  &str() const;
 
     String toString() const;