abstract VC6 workaround inside a WX_CPPUNIT_ALLOW_EQUALS_TO_INT() macro

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index b11bebf5a907144bc0736abf609347c66291a995..81dcbe2ef2c75afa1d4906ba334158f0ee984c73 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -56,7 +56,6 @@
 #include "wx/afterstd.h"
 
 #include "wx/string.h"
-#include "wx/filefn.h"  // for wxFileOffset
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -106,6 +105,10 @@ assertEquals(const wchar_t *expected,
     assertEquals(wxString(expected), actual, sourceLine, message);
 }
 
+CPPUNIT_NS_END
+
+// define an assertEquals() overload for the given types, this is a helper and
+// shouldn't be used directly because of VC6 complications, see below
 #define WX_CPPUNIT_ASSERT_EQUALS(T1, T2)                                      \
     inline void                                                               \
     assertEquals(T1 expected,                                                 \
@@ -122,28 +125,34 @@ assertEquals(const wchar_t *expected,
         }                                                                     \
     }
 
-// and another to be able to specify (usually literal) ints as expected values
-// for functions returning size_t/short/long/wxFileOffset
-WX_CPPUNIT_ASSERT_EQUALS(int, long)
-WX_CPPUNIT_ASSERT_EQUALS(int, short)
-WX_CPPUNIT_ASSERT_EQUALS(int, size_t)
-WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
-
-// special section with VC6 workarounds: due to incorrect resolution of
-// overloaded/template functions in this compiler (it basically doesn't use the
-// template version at all if any overloaded function matches partially even if
-// none of them matches fully) we also need
-#ifdef __VISUALC6__
-
-WX_CPPUNIT_ASSERT_EQUALS(int, int)
-WX_CPPUNIT_ASSERT_EQUALS(long, long)
-WX_CPPUNIT_ASSERT_EQUALS(short, short)
-WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t)
-WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset)
-
-#endif // VC6
+// this macro allows us to specify (usually literal) ints as expected values
+// for functions returning integral types different from "int"
+//
+// FIXME-VC6: due to incorrect resolution of overloaded/template functions in
+//            this compiler (it basically doesn't use the template version at
+//            all if any overloaded function matches partially even if none of
+//            them matches fully) we also need to provide extra overloads
 
-CPPUNIT_NS_END
+#ifdef __VISUALC6__
+    #define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
+        CPPUNIT_NS_BEGIN \
+            WX_CPPUNIT_ASSERT_EQUALS(int, T) \
+            WX_CPPUNIT_ASSERT_EQUALS(T, T) \
+        CPPUNIT_NS_END
+
+    CPPUNIT_NS_BEGIN
+        WX_CPPUNIT_ASSERT_EQUALS(int, int)
+    CPPUNIT_NS_END
+#else // !VC6
+    #define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
+        CPPUNIT_NS_BEGIN \
+            WX_CPPUNIT_ASSERT_EQUALS(int, T) \
+        CPPUNIT_NS_END
+#endif // VC6/!VC6
+
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(size_t)
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 033707b17cec68a46f4a06d5823c431595fa7258..70dd191b99530e19900476c1fe8cc616a34603da 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -32,6 +32,8 @@ static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt)
     return ostr;
 }
 
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t)
+
 // to test Today() meaningfully we must be able to change the system date which
 // is not usually the case, but if we're under Win32 we can try it -- define
 // the macro below to do it

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 9b46aa90c803a7ab48f82e8193b67d3e7656e8ea..36394c56f3b414c5908e5e93bbeceda5ce438062 100644 (file)
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -29,6 +29,8 @@
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 
 
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset)
+
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
 //

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 6dafda7a87844b10a2222e7e396c4c584fa19632..46ce94b7e80a442b96b41f318dcf0447bc6c1bc6 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
-<!--\r
-\r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
-  Do not modify, all changes will be overwritten!\r
-\r
--->\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="7.10"\r
@@ -542,7 +535,6 @@
                </Configuration>\r
        </Configurations>\r
        <References>\r
-               \r
        </References>\r
        <Files>\r
                <Filter\r
@@ -551,33 +543,92 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                        <File\r
                                RelativePath=".\archive\archivetest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\arrays\arrays.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\atomic.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\base64\base64.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\bstream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\cmdline\cmdlinetest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\mbconv\convautotest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\crt.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\datastreamtest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\datetime\datetimetest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\dummy.cpp">\r
@@ -632,155 +683,439 @@
                        </File>\r
                        <File\r
                                RelativePath=".\weakref\evtconnection.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\ffilestream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\fileback.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\config\fileconf.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\filekind\filekind.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\filename\filenametest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\filestream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\filesys\filesystest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\fontmap\fontmaptest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\formatconverter\formatconvertertest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\hashes\hashes.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\iostream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\iostreams.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\net\ipc.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\largefile.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\lists\lists.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\longlong\longlongtest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\mbconv\mbconvtest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\memstream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\misc\misctests.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\queue.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\regex\regextest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\scopeguard\scopeguardtest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\net\socket.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\socketstream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\sstream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\stdstrings.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\archive\tartest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\tempfile.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\test.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\textfile\textfiletest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\events\timertest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\tls.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\tokenizer.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\unichar.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\unicode.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\uris\uris.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\vararg.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\vectors\vectors.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\vsnprintf.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\weakref\weakref.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\regex\wxregextest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\xlocale\xlocale.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\xml\xmltest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\archive\ziptest.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\zlibstream.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
-               \r
        </Globals>\r
 </VisualStudioProject>\r
-\r