Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix VC9 compilation: FileNameInfo identifier conflicts with an enum name in the SDK it uses, so rename it to TestFileNameInfo

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-27 09:20:10 +00:00
parent d9fb481c56
commit 5fed01a943
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/filename/filenametest.cpp
View File

@@ -38,7 +38,7 @@ inline std::ostream& operator<<(std::ostream& o, const wxFileName& fn)
// test data // test data
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static struct FileNameInfo static struct TestFileNameInfo
{ {
const wxChar *fullname; const wxChar *fullname;
const wxChar *volume; const wxChar *volume;
@@ -146,7 +146,7 @@ void FileNameTestCase::TestConstruction()
{ {
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{ {
const FileNameInfo& fni = filenames[n]; const TestFileNameInfo& fni = filenames[n];
wxFileName fn(fni.fullname, fni.format); wxFileName fn(fni.fullname, fni.format);
@@ -238,7 +238,7 @@ void FileNameTestCase::TestSplit()
{ {
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{ {
const FileNameInfo& fni = filenames[n]; const TestFileNameInfo& fni = filenames[n];
wxString volume, path, name, ext; wxString volume, path, name, ext;
wxFileName::SplitPath(fni.fullname, wxFileName::SplitPath(fni.fullname,
&volume, &path, &name, &ext, fni.format); &volume, &path, &name, &ext, fni.format);