From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Sep 2008 09:20:10 +0000 (+0000)
Subject: fix VC9 compilation: FileNameInfo identifier conflicts with an enum name in the SDK... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5fed01a943c6ad8d11e60368b7c9fdbca6bb2fa2?ds=inline

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

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 165d1d7a4e..770ca8ac69 100644
--- 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
 // ----------------------------------------------------------------------------
 
-static struct FileNameInfo
+static struct TestFileNameInfo
 {
     const wxChar *fullname;
     const wxChar *volume;
@@ -146,7 +146,7 @@ void FileNameTestCase::TestConstruction()
 {
     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);
 
@@ -238,7 +238,7 @@ void FileNameTestCase::TestSplit()
 {
     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);