Silence Initialization Order Warnings 2.

diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
old mode 100644 (file)
new mode 100755 (executable)
index df540ca..c2ad291
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -73,8 +73,8 @@ namespace
 // If Win9x, converts and stores it into m_name to avoid calling Unicode version functions.
 
 FileName::FileName(const wchar_t *name) 
-  : m_wname(SystemSupportsUnicode ? name : L"")
-  , m_name (SystemSupportsUnicode ? "" : unicodeToAnsi(name))
+  : m_name (SystemSupportsUnicode ? "" : unicodeToAnsi(name))
+  , m_wname(SystemSupportsUnicode ? name : L"")
 {
 }
 
@@ -84,8 +84,8 @@ FileName::FileName(const char *name)
 }
 
 FileName::FileName(const FileName &name) 
-  : m_wname(name.m_wname)
-  , m_name (name.m_name) 
+  : m_name (name.m_name) 
+  , m_wname(name.m_wname)
 {
 }
 

diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index 0fdb8ffc793483a4bec4013c384fb4fda054790c..86826964499d395cd3dc1674064feb7a6b577608 100755 (executable)
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -50,8 +50,8 @@ namespace TagLib {
     String toString() const;
 
   private:
-    const std::wstring m_wname;
     const std::string  m_name;
+    const std::wstring m_wname;
   };
 #else
   typedef const char *FileName;