Silence Initialization Order Warnings 2.

This commit is contained in:
Festus Hagen 2013-06-20 16:40:05 -04:00
parent 451616f99a
commit 550510ff3f
2 changed files with 5 additions and 5 deletions

8
taglib/toolkit/tiostream.cpp Normal file → Executable file
View File

@ -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)
{
}

View File

@ -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;