------------------------------------------------------------
revno: 13076
revision-id: kinkie@squid-cache.org-20131031111445-qbsvl9cphivvnah2
parent: kinkie@squid-cache.org-20131031075944-3oxcdmogfdqrcmif
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Thu 2013-10-31 12:14:45 +0100
message:
  Fixed icc compatibility for stubs in stub_libauth_acls.cc
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20131031111445-qbsvl9cphivvnah2
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 722b477d6c5e99589d2b8f0ff61a9d2fb780cbc0
# timestamp: 2013-10-31 11:55:27 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20131031075944-\
#   3oxcdmogfdqrcmif
# 
# Begin patch
=== modified file 'src/tests/stub_libauth_acls.cc'
--- src/tests/stub_libauth_acls.cc	2013-10-30 14:30:33 +0000
+++ src/tests/stub_libauth_acls.cc	2013-10-31 11:14:45 +0000
@@ -7,37 +7,37 @@
 #include "acl/Acl.h" /* for allow_t */
 
 #include "auth/Acl.h"
-allow_t AuthenticateAcl(ACLChecklist *) STUB
+allow_t AuthenticateAcl(ACLChecklist *) STUB_RETVAL(ACCESS_DENIED)
 
 #include "auth/AclMaxUserIp.h"
-ACL * ACLMaxUserIP::clone() const STUB
+ACL * ACLMaxUserIP::clone() const STUB_RETVAL(NULL)
 ACLMaxUserIP::ACLMaxUserIP (char const *) STUB
 ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const &) STUB
 ACLMaxUserIP::~ACLMaxUserIP() STUB
-char const * ACLMaxUserIP::typeString() const STUB
-bool ACLMaxUserIP::empty () const STUB
-bool ACLMaxUserIP::valid () const STUB
+char const * ACLMaxUserIP::typeString() const STUB_RETVAL(NULL)
+bool ACLMaxUserIP::empty () const STUB_RETVAL(false)
+bool ACLMaxUserIP::valid () const STUB_RETVAL(false)
 void ACLMaxUserIP::parse() STUB
-int ACLMaxUserIP::match(Auth::UserRequest::Pointer, Ip::Address const &) STUB
-int ACLMaxUserIP::match(ACLChecklist *) STUB
-wordlist * ACLMaxUserIP::dump() const STUB
+int ACLMaxUserIP::match(Auth::UserRequest::Pointer, Ip::Address const &) STUB_RETVAL(0)
+int ACLMaxUserIP::match(ACLChecklist *) STUB_RETVAL(0)
+wordlist * ACLMaxUserIP::dump() const STUB_RETVAL(NULL)
 
 #include "auth/AclProxyAuth.h"
 ACLProxyAuth::~ACLProxyAuth() STUB
 ACLProxyAuth::ACLProxyAuth(ACLData<char const *> *, char const *) STUB
 ACLProxyAuth::ACLProxyAuth (ACLProxyAuth const &) STUB
-ACLProxyAuth & ACLProxyAuth::operator= (ACLProxyAuth const &) STUB
-char const * ACLProxyAuth::typeString() const STUB
+ACLProxyAuth & ACLProxyAuth::operator= (ACLProxyAuth const & a) STUB_RETVAL(const_cast<ACLProxyAuth &>(a))
+char const * ACLProxyAuth::typeString() const STUB_RETVAL(NULL)
 void ACLProxyAuth::parse() STUB
-int ACLProxyAuth::match(ACLChecklist *) STUB
-wordlist * ACLProxyAuth::dump() const STUB
-bool ACLProxyAuth::empty () const STUB
-bool ACLProxyAuth::valid () const STUB
-ProxyAuthLookup * ProxyAuthLookup::Instance() STUB
+int ACLProxyAuth::match(ACLChecklist *) STUB_RETVAL(0)
+wordlist * ACLProxyAuth::dump() const STUB_RETVAL(NULL)
+bool ACLProxyAuth::empty () const STUB_RETVAL(false)
+bool ACLProxyAuth::valid () const STUB_RETVAL(false)
+ProxyAuthLookup * ProxyAuthLookup::Instance() STUB_RETVAL(NULL)
 void ProxyAuthLookup::checkForAsync(ACLChecklist *) const STUB
 void ProxyAuthLookup::LookupDone(void *) STUB
-ACL * ACLProxyAuth::clone() const STUB
-int ACLProxyAuth::matchForCache(ACLChecklist *) STUB
-int ACLProxyAuth::matchProxyAuth(ACLChecklist *) STUB
+ACL * ACLProxyAuth::clone() const STUB_RETVAL(NULL)
+int ACLProxyAuth::matchForCache(ACLChecklist *) STUB_RETVAL(0)
+int ACLProxyAuth::matchProxyAuth(ACLChecklist *) STUB_RETVAL(0)
 
 #endif /* USE_AUTH */