From 550510ff3f501ed46af96eeaa3928e25ff41fd68 Mon Sep 17 00:00:00 2001 From: Festus Hagen Date: Thu, 20 Jun 2013 16:40:05 -0400 Subject: [PATCH] Silence Initialization Order Warnings 2. --- taglib/toolkit/tiostream.cpp | 8 ++++---- taglib/toolkit/tiostream.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 taglib/toolkit/tiostream.cpp diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp old mode 100644 new mode 100755 index df540ca8..c2ad2912 --- 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 0fdb8ffc..86826964 100755 --- 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;