---------------------
PatchSet 4601 
Date: 2007/05/19 04:51:33
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix compile errors in branch after merge from HEAD.

Members: 
	src/tests/testHttpRequest.cc:1.1.14.7->1.1.14.8 

Index: squid3/src/tests/testHttpRequest.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/tests/testHttpRequest.cc,v
retrieving revision 1.1.14.7
retrieving revision 1.1.14.8
diff -u -r1.1.14.7 -r1.1.14.8
--- squid3/src/tests/testHttpRequest.cc	18 May 2007 17:41:09 -0000	1.1.14.7
+++ squid3/src/tests/testHttpRequest.cc	19 May 2007 04:51:33 -0000	1.1.14.8
@@ -110,10 +110,10 @@
     expected_port = 80;
     CPPUNIT_ASSERT_EQUAL(expected_port, aRequest->port);
     CPPUNIT_ASSERT_EQUAL(METHOD_GET, aRequest->method);
-    CPPUNIT_ASSERT_EQUAL(String("[2000:800::45]"), String(aRequest->GetHost()));
-    CPPUNIT_ASSERT_EQUAL(String("/foo"), aRequest->urlpath);
+    CPPUNIT_ASSERT_EQUAL((string)"[2000:800::45]", (string)aRequest->GetHost());
+    CPPUNIT_ASSERT_EQUAL((string)"/foo", aRequest->urlpath);
     CPPUNIT_ASSERT_EQUAL(PROTO_HTTP, aRequest->protocol);
-    CPPUNIT_ASSERT_EQUAL(String("http://[2000:800::45]/foo"), String(url));
+    CPPUNIT_ASSERT_EQUAL((string)"http://[2000:800::45]/foo", (string)url);
     xfree(url);
 
     /* valid IPv6 address with port */
@@ -122,10 +122,10 @@
     expected_port = 90;
     CPPUNIT_ASSERT_EQUAL(expected_port, aRequest->port);
     CPPUNIT_ASSERT_EQUAL(METHOD_GET, aRequest->method);
-    CPPUNIT_ASSERT_EQUAL(String("[2000:800::45]"), String(aRequest->GetHost()));
-    CPPUNIT_ASSERT_EQUAL(String("/foo"), aRequest->urlpath);
+    CPPUNIT_ASSERT_EQUAL((string)"[2000:800::45]", (string)aRequest->GetHost());
+    CPPUNIT_ASSERT_EQUAL((string)"/foo", aRequest->urlpath);
     CPPUNIT_ASSERT_EQUAL(PROTO_HTTP, aRequest->protocol);
-    CPPUNIT_ASSERT_EQUAL(String("http://[2000:800::45]:90/foo"), String(url));
+    CPPUNIT_ASSERT_EQUAL((string)"http://[2000:800::45]:90/foo", (string)url);
     xfree(url);
 
     /* IPv6 address as invalid (bug trigger) */
@@ -136,13 +136,13 @@
     CPPUNIT_ASSERT_EQUAL(METHOD_GET, aRequest->method);
 #if USE_IPV6
       /* We hasve fixed this in IPv6 build. */
-    CPPUNIT_ASSERT_EQUAL(String("[2000:800::45]"), String(aRequest->GetHost()));
+    CPPUNIT_ASSERT_EQUAL((string)"[2000:800::45]", (string)aRequest->GetHost());
 #else
       /* NO fix is possible in IPv4-pure build. */
-    CPPUNIT_ASSERT_EQUAL(String("2000:800::45"), String(aRequest->GetHost()));
+    CPPUNIT_ASSERT_EQUAL((string)"2000:800::45", (string)aRequest->GetHost());
 #endif
-    CPPUNIT_ASSERT_EQUAL(String("/foo"), aRequest->urlpath);
+    CPPUNIT_ASSERT_EQUAL((string)"/foo", aRequest->urlpath);
     CPPUNIT_ASSERT_EQUAL(PROTO_HTTP, aRequest->protocol);
-    CPPUNIT_ASSERT_EQUAL(String("http://2000:800::45/foo"), String(url));
+    CPPUNIT_ASSERT_EQUAL((string)"http://2000:800::45/foo", (string)url);
     xfree(url);
 }