mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removed an ambiguous cast from FileNameHandle to FileName."

Browse Source 
This reverts commit 9af7601bae.
This commit is contained in:
Tsuda Kageyu 2014-08-23 00:01:11 +09:00
parent dfbaee4103
commit 0e6d8617ae
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
taglib/toolkit/tfilestream.cpp
View File

@ -85,14 +85,10 @@ namespace
#else // _WIN32
class FileNameHandle
struct FileNameHandle : public std::string
{
private:
std::string name;
public:
FileNameHandle(FileName n) : name(n) {}
FileName toFileName() const { return name.c_str(); }
FileNameHandle(FileName name) : std::string(name) {}
operator FileName () const { return c_str(); }
};
typedef FILE* FileHandle;
@ -126,10 +122,12 @@ namespace
class FileStream::FileStreamPrivate
{
public:
FileStreamPrivate(const FileName &fileName) :
file(InvalidFileHandle),
name(fileName),
readOnly(true) {}
FileStreamPrivate(const FileName &fileName)
: file(InvalidFileHandle)
, name(fileName)
, readOnly(true)
{
}
FileHandle file;
FileNameHandle name;
@ -140,8 +138,8 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
FileStream::FileStream(FileName fileName, bool openReadOnly) :
d(new FileStreamPrivate(fileName))
FileStream::FileStream(FileName fileName, bool openReadOnly)
: d(new FileStreamPrivate(fileName))
{
// First try with read / write mode, if that fails, fall back to read only.
@ -158,7 +156,7 @@ FileStream::FileStream(FileName fileName, bool openReadOnly) :
# ifdef _WIN32
debug("Could not open file " + fileName.toString());
# else
debug("Could not open file " + String(d->name.toFileName()));
debug("Could not open file " + String(static_cast<const char *>(d->name)));
# endif
}
}
@ -173,11 +171,7 @@ FileStream::~FileStream()
FileName FileStream::name() const
{
# ifdef _WIN32
return d->name;
# else
return d->name.toFileName();
# endif
}
ByteVector FileStream::readBlock(ulong length)