--------------------- PatchSet 1131 Date: 2004/12/26 09:15:37 Author: serassio Branch: nt Tag: (none) Log: Fixes for MS Visual Studio C++ 2005 Members: src/http.cc:1.15.2.26->1.15.2.27 src/fs/ufs/ufscommon.cc:1.1.2.2->1.1.2.3 Index: squid3/src/http.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v retrieving revision 1.15.2.26 retrieving revision 1.15.2.27 diff -u -r1.15.2.26 -r1.15.2.27 --- squid3/src/http.cc 24 Dec 2004 14:35:08 -0000 1.15.2.26 +++ squid3/src/http.cc 26 Dec 2004 09:15:37 -0000 1.15.2.27 @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.15.2.26 2004/12/24 14:35:08 serassio Exp $ + * $Id: http.cc,v 1.15.2.27 2004/12/26 09:15:37 serassio Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -801,7 +801,7 @@ _peer->stats.n_keepalives_recv++; if (entry->getReply()->date > -1 && !_peer) { - int skew = abs(entry->getReply()->date - squid_curtime); + int skew = abs((int)(entry->getReply()->date - squid_curtime)); if (skew > 86400) debug(11, 3) ("%s's clock is skewed by %d seconds!\n", Index: squid3/src/fs/ufs/ufscommon.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/ufscommon.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/src/fs/ufs/ufscommon.cc 24 Dec 2004 08:40:09 -0000 1.1.2.2 +++ squid3/src/fs/ufs/ufscommon.cc 26 Dec 2004 09:16:27 -0000 1.1.2.3 @@ -1,5 +1,5 @@ /* - * $Id: ufscommon.cc,v 1.1.2.2 2004/12/24 08:40:09 serassio Exp $ + * $Id: ufscommon.cc,v 1.1.2.3 2004/12/26 09:16:27 serassio Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins @@ -352,7 +352,7 @@ continue; } else { - x = ::log(++counts.bad_log_op) / ::log(10.0); + x = ::log(static_cast(++counts.bad_log_op)) / ::log(10.0); if (0.0 == x - (double) (int) x) debug(47, 1) ("WARNING: %d invalid swap log entries found\n",