--------------------- PatchSet 1130 Date: 2004/12/26 09:13:18 Author: serassio Branch: nt Tag: (none) Log: Drop of MS Visual Studio C++ 6 support Members: src/asn.cc:1.8.2.11->1.8.2.12 src/debug.cc:1.6.2.11->1.6.2.12 Index: squid3/src/asn.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/asn.cc,v retrieving revision 1.8.2.11 retrieving revision 1.8.2.12 diff -u -r1.8.2.11 -r1.8.2.12 --- squid3/src/asn.cc 1 Sep 2004 08:29:30 -0000 1.8.2.11 +++ squid3/src/asn.cc 26 Dec 2004 09:13:18 -0000 1.8.2.12 @@ -1,6 +1,6 @@ /* - * $Id: asn.cc,v 1.8.2.11 2004/09/01 08:29:30 serassio Exp $ + * $Id: asn.cc,v 1.8.2.12 2004/12/26 09:13:18 serassio Exp $ * * DEBUG: section 53 AS Number handling * AUTHOR: Duane Wessels, Kostas Anagnostakis @@ -65,10 +65,8 @@ /* explicit instantiation required for some systems */ -#if !(defined(_MSC_VER) && (_MSC_VER == 1200)) /* Microsoft Visual C++ 6.0 Compiler ONLY */ template cbdata_type List ::CBDATA_List; -#endif /* * Structure for as number information. it could be simply Index: squid3/src/debug.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/debug.cc,v retrieving revision 1.6.2.11 retrieving revision 1.6.2.12 diff -u -r1.6.2.11 -r1.6.2.12 --- squid3/src/debug.cc 1 Sep 2003 07:46:55 -0000 1.6.2.11 +++ squid3/src/debug.cc 26 Dec 2004 09:13:18 -0000 1.6.2.12 @@ -1,6 +1,6 @@ /* - * $Id: debug.cc,v 1.6.2.11 2003/09/01 07:46:55 serassio Exp $ + * $Id: debug.cc,v 1.6.2.12 2004/12/26 09:13:18 serassio Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -37,17 +37,10 @@ #include "Debug.h" #include -#ifdef _MSC_VER /* Work around for a LNK2001 error */ -#if _MSC_VER == 1200 /* Microsoft Visual C++ 6.0 ONLY */ -namespace std { -const fpos_t _Fpz = {0}; -} -#endif -#if _MSC_VER == 1300 /* Microsoft Visual C++ 7.0 ONLY */ +#ifdef _MSC_VER /* Work around for a LNK2001 error on Microsoft Visual C++ */ namespace std { fpos_t _Fpz = {0}; } -#endif #endif /* _MSC_VER */ int Debug::Levels[MAX_DEBUG_SECTIONS];