------------------------------------------------------------
revno: 11977
revision-id: kinkie@squid-cache.org-20120120155958-d8dn0nni6rkg0m7c
parent: squidadm@squid-cache.org-20120120014250-55gwnozdsk0gzp3f
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Fri 2012-01-20 16:59:58 +0100
message:
  Remove unnecessary stub_tools dependency on String 
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20120120155958-d8dn0nni6rkg0m7c
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 2d2e580709e2d7eb1e7777bf4fa29e0c57b23500
# timestamp: 2012-01-20 16:55:24 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20120120014250-\
#   55gwnozdsk0gzp3f
# 
# Begin patch
=== modified file 'src/tests/stub_tools.cc'
--- src/tests/stub_tools.cc	2012-01-07 10:15:40 +0000
+++ src/tests/stub_tools.cc	2012-01-20 15:59:58 +0000
@@ -73,7 +73,8 @@
 bool IamCoordinatorProcess() STUB_RETVAL(false)
 bool IamPrimaryProcess() STUB_RETVAL(false)
 int NumberOfKids() STUB_RETVAL(0)
-String ProcessRoles() STUB_RETVAL(String())
+//not yet needed in the Stub, causes dependency on String
+//String ProcessRoles() STUB_RETVAL(String())
 void writePidFile(void) STUB
 pid_t readPidFile(void) STUB_RETVAL(0)
 void setMaxFD(void) STUB