From: Amos Jeffries Date: Wed, 9 Oct 2013 14:02:57 +0000 (-0600) Subject: Fix PosToString duplicate definiton X-Git-Tag: SQUID_3_5_0_1~602 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e17fa6591838718567aa0b18bda7bb1e39e1821d;p=thirdparty%2Fsquid.git Fix PosToString duplicate definiton Since SBuf::size_type and std::string::size_type are now both unsigned and npos is the same value in both this function is a duplicate and the stricter compilers complain. --- diff --git a/src/tests/SBufFindTest.cc b/src/tests/SBufFindTest.cc index 5e436f5d21..16de357a98 100644 --- a/src/tests/SBufFindTest.cc +++ b/src/tests/SBufFindTest.cc @@ -189,12 +189,14 @@ AnyToString(const Type &value) return sbuf.str(); } +#if 0 /// helper function to convert SBuf position to a human-friendly string inline std::string PosToString(const SBuf::size_type pos) { return pos == SBuf::npos ? std::string("npos") : AnyToString(pos); } +#endif /// helper function to convert std::string position to a human-friendly string inline std::string