fix VC9 compilation: FileNameInfo identifier conflicts with an enum name in the SDK...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 165d1d7a4eaafbeaad0740fd63cd1ecf06af1726..770ca8ac69af748637fabc45edc6d80e412e4e95 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -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 *volume;
 {
     const wxChar *fullname;
     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;
         wxFileName::SplitPath(fni.fullname,
                               &volume, &path, &name, &ext, fni.format);
         wxString volume, path, name, ext;
         wxFileName::SplitPath(fni.fullname,
                               &volume, &path, &name, &ext, fni.format);