From 311baa61ff64b8bef09a570bc66f3f8fcdaa306a Mon Sep 17 00:00:00 2001 From: hno <> Date: Sun, 29 Apr 2007 23:35:52 +0000 Subject: [PATCH] The hex/dec I/O format operators is in the std namespace --- src/forward.cc | 8 ++++---- src/icmp.cc | 4 ++-- src/unlinkd.cc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/forward.cc b/src/forward.cc index f85de0e47e..a80de6bec1 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -1,6 +1,6 @@ /* - * $Id: forward.cc,v 1.161 2007/04/28 22:26:37 hno Exp $ + * $Id: forward.cc,v 1.162 2007/04/29 17:35:52 hno Exp $ * * DEBUG: section 17 Request Forwarding * AUTHOR: Duane Wessels @@ -873,7 +873,7 @@ FwdState::connectStart() if (setsockopt(fd, SOL_IP, IP_TPROXY, &itp, sizeof(itp)) == -1) { debugs(20, 1, "tproxy ip=" << inet_ntoa(itp.v.addr.faddr) << - ",0x" << hex << itp.v.addr.faddr.s_addr << dec << + ",0x" << std::hex << itp.v.addr.faddr.s_addr << std::dec << ",port=" << itp.v.addr.fport << " ERROR ASSIGN"); request->flags.tproxy = 0; @@ -882,8 +882,8 @@ FwdState::connectStart() itp.v.flags = ITP_CONNECT; if (setsockopt(fd, SOL_IP, IP_TPROXY, &itp, sizeof(itp)) == -1) { - debugs(20, 1, "tproxy ip=" << hex << - itp.v.addr.faddr.s_addr << dec << ",port=" << + debugs(20, 1, "tproxy ip=" << std::hex << + itp.v.addr.faddr.s_addr << std::dec << ",port=" << itp.v.addr.fport << " ERROR CONNECT"); request->flags.tproxy = 0; diff --git a/src/icmp.cc b/src/icmp.cc index f4d31de57f..b17eb56db7 100644 --- a/src/icmp.cc +++ b/src/icmp.cc @@ -1,6 +1,6 @@ /* - * $Id: icmp.cc,v 1.91 2007/04/28 22:26:37 hno Exp $ + * $Id: icmp.cc,v 1.92 2007/04/29 17:35:52 hno Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -268,7 +268,7 @@ icmpOpen(void) #ifdef _SQUID_MSWIN_ - debugs(37, 4, "Pinger handle: 0x" << hex << (unsigned)hIpc << dec << ", PID: " << pid); + debugs(37, 4, "Pinger handle: 0x" << std::hex << (unsigned)hIpc << std::dec << ", PID: " << pid); #endif #endif diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 9b3ec19a05..cd36c8a28d 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.cc,v 1.62 2007/04/28 22:26:38 hno Exp $ + * $Id: unlinkd.cc,v 1.63 2007/04/29 17:35:52 hno Exp $ * * DEBUG: section 2 Unlink Daemon * AUTHOR: Duane Wessels @@ -244,7 +244,7 @@ IPC_FIFO, #ifdef _SQUID_MSWIN_ - debugs(2, 4, "Unlinkd handle: 0x" << hex << (unsigned)hIpc << dec << ", PID: " << pid); + debugs(2, 4, "Unlinkd handle: 0x" << std::hex << (unsigned)hIpc << std::dec << ", PID: " << pid); #endif -- 2.47.2