From: robertc <>
Date: Sat, 2 Sep 2006 09:54:27 +0000 (+0000)
Subject: (Tres Seaver) Fix bug 1749 - make check errors from gcc 3.5.5.
X-Git-Tag: SQUID_3_0_PRE5~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41030a36176c7f63ffa10703731fb97d40c50f3a;p=thirdparty%2Fsquid.git

(Tres Seaver) Fix bug 1749 - make check errors from gcc 3.5.5.
---

diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc
index 8709cb1e6a..7b479ebbe1 100644
--- a/src/tests/testHttpRequestMethod.cc
+++ b/src/tests/testHttpRequestMethod.cc
@@ -57,7 +57,9 @@ testHttpRequestMethod::testAssignFrommethod_t()
 void
 testHttpRequestMethod::testDefaultConstructor()
 {
-    CPPUNIT_ASSERT_EQUAL(HttpRequestMethod(), HttpRequestMethod(METHOD_NONE));
+    HttpRequestMethod lhs;
+    HttpRequestMethod rhs(METHOD_NONE);
+    CPPUNIT_ASSERT_EQUAL(lhs, rhs);
 }
 
 /*
diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index d7beaac983..de2fadc424 100644
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -32,8 +32,13 @@ static Initer ensure_mempools;
 void
 testURL::testConstructScheme()
 {
-    CPPUNIT_ASSERT_EQUAL(URLScheme(), URL(PROTO_NONE).getScheme());
-    CPPUNIT_ASSERT_EQUAL(URLScheme(PROTO_FTP), URL(PROTO_FTP).getScheme());
+    URLScheme empty_scheme;
+    URL protoless_url(PROTO_NONE);
+    CPPUNIT_ASSERT_EQUAL(empty_scheme, protoless_url.getScheme());
+
+    URLScheme ftp_scheme(PROTO_FTP);
+    URL ftp_url(PROTO_FTP);
+    CPPUNIT_ASSERT_EQUAL(ftp_scheme, ftp_url.getScheme());
 }
 
 /*
@@ -44,8 +49,9 @@ testURL::testConstructScheme()
 void
 testURL::testDefaultConstructor()
 {
+    URLScheme aScheme;
     URL aUrl;
-    CPPUNIT_ASSERT_EQUAL(URLScheme(), aUrl.getScheme());
+    CPPUNIT_ASSERT_EQUAL(aScheme, aUrl.getScheme());
 
     URL *urlPointer = new URL;
     CPPUNIT_ASSERT(urlPointer != NULL);
diff --git a/src/tests/testURLScheme.cc b/src/tests/testURLScheme.cc
index 8d97137849..1ec0d0133f 100644
--- a/src/tests/testURLScheme.cc
+++ b/src/tests/testURLScheme.cc
@@ -48,11 +48,14 @@ testHttpRequestMethod::testConstructCharStartEnd()
 void
 testURLScheme::testAssignFromprotocol_t()
 {
+    URLScheme empty_scheme;
     URLScheme scheme;
     scheme = PROTO_NONE;
-    CPPUNIT_ASSERT_EQUAL(URLScheme(), scheme);
+    CPPUNIT_ASSERT_EQUAL(empty_scheme, scheme);
+
+    URLScheme https_scheme(PROTO_HTTPS);
     scheme = PROTO_HTTPS;
-    CPPUNIT_ASSERT_EQUAL(URLScheme(PROTO_HTTPS), scheme);
+    CPPUNIT_ASSERT_EQUAL(https_scheme, scheme);
 }
 
 /*
@@ -76,7 +79,9 @@ testURLScheme::testCastToprotocol_t()
 void
 testURLScheme::testDefaultConstructor()
 {
-    CPPUNIT_ASSERT_EQUAL(URLScheme(), URLScheme(PROTO_NONE));
+    URLScheme lhs;
+    URLScheme rhs(PROTO_NONE);
+    CPPUNIT_ASSERT_EQUAL(lhs, rhs);
 }
 
 /*
@@ -85,9 +90,12 @@ testURLScheme::testDefaultConstructor()
 void
 testURLScheme::testConstructprotocol_t()
 {
-    CPPUNIT_ASSERT_EQUAL(URLScheme(PROTO_NONE), URLScheme(PROTO_NONE));
-    CPPUNIT_ASSERT_EQUAL(URLScheme(PROTO_CACHEOBJ), URLScheme(PROTO_CACHEOBJ));
-    CPPUNIT_ASSERT(URLScheme(PROTO_NONE) != URLScheme(PROTO_CACHEOBJ));
+    URLScheme lhs_none(PROTO_NONE), rhs_none(PROTO_NONE);
+    CPPUNIT_ASSERT_EQUAL(lhs_none, rhs_none);
+
+    URLScheme lhs_cacheobj(PROTO_CACHEOBJ), rhs_cacheobj(PROTO_CACHEOBJ);
+    CPPUNIT_ASSERT_EQUAL(lhs_cacheobj, rhs_cacheobj);
+    CPPUNIT_ASSERT(lhs_none != rhs_cacheobj);
 }
 
 /*
@@ -96,7 +104,10 @@ testURLScheme::testConstructprotocol_t()
 void
 testURLScheme::testConst_str()
 {
-    CPPUNIT_ASSERT_EQUAL(String("wais"), String(URLScheme(PROTO_WAIS).const_str()));
+    String lhs("wais");
+    URLScheme wais(PROTO_WAIS);
+    String rhs(wais.const_str());
+    CPPUNIT_ASSERT_EQUAL(lhs, rhs);
 }
 
 /*
@@ -132,5 +143,7 @@ testURLScheme::testStream()
 {
     std::ostringstream buffer;
     buffer << URLScheme(PROTO_HTTP);
-    CPPUNIT_ASSERT_EQUAL(String("http"), String(buffer.str().c_str()));
+    String http_str("http");
+    String from_buf(buffer.str().c_str());
+    CPPUNIT_ASSERT_EQUAL(http_str, from_buf);
 }