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

GCC 4.2 dependencies
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fb72b8191..a452e8654e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1165,6 +1165,7 @@ tests_testACLMaxUserIP_SOURCES= \
 	Packer.cc \
 	Parsing.cc \
 	SquidMath.cc \
+	StatCounters.cc \
 	StatCounters.h \
 	StatHist.h \
 	tests/stub_StatHist.cc \
@@ -1194,9 +1195,11 @@ tests_testACLMaxUserIP_SOURCES= \
 	tests/stub_errorpage.cc \
 	tests/stub_fd.cc \
 	tests/stub_HttpRequest.cc \
+	tests/stub_libcomm.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 \
@@ -1238,8 +1241,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 1f40fc9cfe..cb53b19f68 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 f6d787031d..4e2db216e0 100644
--- a/src/tests/stub_fd.cc
+++ b/src/tests/stub_fd.cc
@@ -65,3 +65,10 @@ fd_note(int fd, const char *s)
 {
     fatal ("Not Implemented");
 }
+
+void
+fdAdjustReserved()
+{
+    fatal ("Not Implemented");
+}
+
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)