From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 30 Jul 2012 08:49:59 +0000 (-0600)
Subject: GCC 4.2 dependencies
X-Git-Tag: sourceformat-review-1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a016163c2f5e535e04a46d37156bdd2d1241e459;p=thirdparty%2Fsquid.git

GCC 4.2 dependencies
---

diff --git a/src/Makefile.am b/src/Makefile.am
index bd26a1b409..88bfe73273 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1168,6 +1168,7 @@ tests_testACLMaxUserIP_SOURCES= \
 	Packer.cc \
 	Parsing.cc \
 	SquidMath.cc \
+	StatCounters.cc \
 	StatCounters.h \
 	StatHist.h \
 	tests/stub_StatHist.cc \
@@ -1197,10 +1198,12 @@ tests_testACLMaxUserIP_SOURCES= \
 	tests/stub_errorpage.cc \
 	tests/stub_fd.cc \
 	tests/stub_HttpRequest.cc \
+	tests/stub_libcomm.cc \
 	tests/stub_libformat.cc \
 	tests/stub_MemObject.cc \
 	tests/stub_MemStore.cc \
 	tests/stub_mime.cc \
+	tests/stub_pconn.cc \
 	tests/stub_store.cc \
 	tests/stub_store_rebuild.cc \
 	tests/stub_store_stats.cc \
@@ -1242,8 +1245,8 @@ tests_testACLMaxUserIP_LDADD= \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
-tests_testACLMaxUserIP_DEPENDENCIES = \
-	$(SQUID_CPPUNIT_LA)
+##tests_testACLMaxUserIP_DEPENDENCIES = \
+##	$(SQUID_CPPUNIT_LA)
 
 ## a demonstration test that does nothing but shows the salient points
 ## involved in writing tests.
diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 5128c35602..0f20b3c1cd 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -12,10 +12,7 @@
 #include "ipcache.h"
 #include "SquidTime.h"
 
-namespace Comm
-{
-CBDATA_CLASS_INIT(ConnOpener);
-};
+CBDATA_NAMESPACED_CLASS_INIT(Comm, ConnOpener);
 
 Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &c, AsyncCall::Pointer &handler, time_t ctimeout) :
         AsyncJob("Comm::ConnOpener"),
diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc
index 1d64cce845..d9d7b89c51 100644
--- a/src/ident/Ident.cc
+++ b/src/ident/Ident.cc
@@ -31,11 +31,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
-
-#include "squid-old.h"
+#include "squid.h"
 
 #if USE_IDENT
-
+#include "squid-old.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
diff --git a/src/tests/stub_fd.cc b/src/tests/stub_fd.cc
index afd90cb230..a5eab4b03f 100644
--- a/src/tests/stub_fd.cc
+++ b/src/tests/stub_fd.cc
@@ -9,3 +9,4 @@ void fd_open(int fd, unsigned int type, const char *desc) STUB
 void fd_close(int fd) STUB
 void fd_bytes(int fd, int len, unsigned int type) STUB
 void fd_note(int fd, const char *s) STUB
+void fdAdjustReserved() STUB
diff --git a/src/tests/stub_libcomm.cc b/src/tests/stub_libcomm.cc
index 9759ed4a1c..c03850b3b3 100644
--- a/src/tests/stub_libcomm.cc
+++ b/src/tests/stub_libcomm.cc
@@ -21,9 +21,12 @@ peer * Comm::Connection::getPeer() const STUB_RETVAL(NULL)
 void Comm::Connection::setPeer(peer * p) STUB
 
 #include "comm/ConnOpener.h"
+CBDATA_NAMESPACED_CLASS_INIT(Comm, ConnOpener);
 bool Comm::ConnOpener::doneAll() const STUB_RETVAL(false)
-//Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &, AsyncCall::Pointer &, time_t) STUB
-//Comm::ConnOpener::~ConnOpener() STUB
+void Comm::ConnOpener::start() STUB
+void Comm::ConnOpener::swanSong() STUB
+Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &, AsyncCall::Pointer &, time_t) : AsyncJob("STUB Comm::ConnOpener") STUB
+Comm::ConnOpener::~ConnOpener() STUB
 void Comm::ConnOpener::setHost(const char *) STUB
 const char * Comm::ConnOpener::getHost() const STUB_RETVAL(NULL)