------------------------------------------------------------ revno: 13061 revision-id: squid3@treenet.co.nz-20131225213350-zxck2zfb5o2tzpwi parent: squid3@treenet.co.nz-20131219090449-o3call70fme0k9di committer: Amos Jeffries branch nick: 3.4 timestamp: Wed 2013-12-25 14:33:50 -0700 message: Fix missing cast in rev.13162 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131225213350-zxck2zfb5o2tzpwi # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 0fcb4fa1fbe7add4b2a3b993700d738f39c13a8d # timestamp: 2013-12-25 21:36:51 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20131219090449-\ # o3call70fme0k9di # # Begin patch === modified file 'src/SquidString.h' --- src/SquidString.h 2013-12-06 12:15:11 +0000 +++ src/SquidString.h 2013-12-25 21:33:50 +0000 @@ -87,7 +87,7 @@ ~String(); typedef size_t size_type; //storage size intentionally unspecified - const static size_type npos = -1; + const static size_type npos = static_cast(-1); String &operator =(char const *); String &operator =(String const &);