GCC 4.2 dependencies

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fb72b8191acddb1d578de0f02832cbb4a01b3ec..a452e8654e1d016660646edf80d15530ab4a0f1b 100644 (file)
--- 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 1f40fc9cfe9840102a7ab28c450e914b3beb778c..cb53b19f68f06f34854bcafe24bd3d9afdb4f71e 100644 (file)
--- 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 1d64cce8454c3f052eb7e4de62f03688b2ffe0d2..d9d7b89c51ff124f437a8dbc539c3b56e674772a 100644 (file)
--- 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 f6d787031d2f1fecef48ccd3888b638fa4bd6f35..4e2db216e01087e9d3135e6a5a12426ca4b404bd 100644 (file)
--- 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 9759ed4a1c5095aaaad37c19c0aa335fe2467747..c03850b3b39fad6269c7d84870b4baaea5d42929 100644 (file)
--- 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)