Fixed compilation warnings/errors under C++ mode

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1569 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 8 insertions, 8 deletions

diff --git a/pjlib-util/src/pjlib-util-test/encryption.c b/pjlib-util/src/pjlib-util-test/encryption.c
index 62d03315..25c2a7bd 100644
--- a/pjlib-util/src/pjlib-util-test/encryption.c
+++ b/pjlib-util/src/pjlib-util-test/encryption.c
@@ -536,7 +536,7 @@ static int base64_test(void)
 	if (rc != PJ_SUCCESS)
 	    return -90;
 
-	if (out_len != strlen(base64_test_vec[i].base64))
+	if (out_len != (int)strlen(base64_test_vec[i].base64))
 	    return -91;
 
 	output[out_len] = '\0';
@@ -551,7 +551,7 @@ static int base64_test(void)
 	if (rc != PJ_SUCCESS)
 	    return -95;
 
-	if (out_len != strlen(base64_test_vec[i].base256))
+	if (out_len != (int)strlen(base64_test_vec[i].base256))
 	    return -96;
 
 	output[out_len] = '\0';
diff --git a/pjsip/src/pjsip-ua/sip_reg.c b/pjsip/src/pjsip-ua/sip_reg.c
index 0a8e6d0d..fda28d70 100644
--- a/pjsip/src/pjsip-ua/sip_reg.c
+++ b/pjsip/src/pjsip-ua/sip_reg.c
@@ -739,8 +739,8 @@ static void tsx_callback(void *token, pjsip_event *event)
 		     * server may not return it.
 		     */
 
-		    uri1 = pjsip_uri_get_uri(contact[i]->uri);
-		    uri2 = pjsip_uri_get_uri(our_contact->uri);
+		    uri1=(const pjsip_uri*)pjsip_uri_get_uri(contact[i]->uri);
+		    uri2=(const pjsip_uri*)pjsip_uri_get_uri(our_contact->uri);
 		    if (pjsip_uri_cmp(PJSIP_URI_IN_CONTACT_HDR, uri1, uri2)==0)
 		    {
 			has_our_contact = PJ_TRUE;
diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c
index 7fcc1ec6..3994c0b4 100644
--- a/pjsip/src/pjsip/sip_auth_client.c
+++ b/pjsip/src/pjsip/sip_auth_client.c
@@ -856,7 +856,7 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_init_req( pjsip_auth_clt_sess *sess,
 	char *uri_str;
 	int len;
 
-	uri_str = pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE);
+	uri_str = (char*)pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE);
 	len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, tdata->msg->line.req.uri,
 			      uri_str, PJSIP_MAX_URL_SIZE);
 	if (len < 1 || len >= PJSIP_MAX_URL_SIZE)
@@ -877,7 +877,7 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_init_req( pjsip_auth_clt_sess *sess,
 		pjsip_generic_string_hdr *hs;
 		char *hdr;
 
-		hdr = pj_pool_alloc(tdata->pool, HDRLEN);
+		hdr = (char*)pj_pool_alloc(tdata->pool, HDRLEN);
 		len = pj_ansi_snprintf(
 		    hdr, HDRLEN,
 		    "%.*s username=\"%.*s\", realm=\"%.*s\","
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 6e988f09..53090c4a 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -621,7 +621,7 @@ void update_service_route(pjsua_acc *acc, pjsip_rx_data *rdata)
     /* Then append the Service-Route URIs */
     for (i=0; i<uri_cnt; ++i) {
 	hr = pjsip_route_hdr_create(pjsua_var.pool);
-	hr->name_addr.uri = pjsip_uri_clone(pjsua_var.pool, uri[i]);
+	hr->name_addr.uri = (pjsip_uri*)pjsip_uri_clone(pjsua_var.pool, uri[i]);
 	pj_list_push_back(&acc->route_set, hr);
     }
 
diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c
index d73a00d6..d41e1ddc 100644
--- a/pjsip/src/pjsua-lib/pjsua_pres.c
+++ b/pjsip/src/pjsua-lib/pjsua_pres.c
@@ -34,7 +34,7 @@ static pjsua_buddy_id pjsua_find_buddy(const pjsip_uri *uri)
     const pjsip_sip_uri *sip_uri;
     unsigned i;
 
-    uri = pjsip_uri_get_uri((pjsip_uri*)uri);
+    uri = (const pjsip_uri*) pjsip_uri_get_uri((pjsip_uri*)uri);
 
     if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
 	return PJSUA_INVALID_ID;