Changeset 1266 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (11 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -165 +165 @@
     cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_ALLOW, NULL);
     if (cap_hdr) {
-        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr));
+        pjsip_msg_add_hdr(tdata->msg, 
+                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr));
     }
 
@@ -171 +172 @@
     cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_ACCEPT, NULL);
     if (cap_hdr) {
-        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr));
+        pjsip_msg_add_hdr(tdata->msg, 
+                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr));
     }
 
@@ -177 +179 @@
     cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_SUPPORTED, NULL);
     if (cap_hdr) {
-        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr));
+        pjsip_msg_add_hdr(tdata->msg, 
+                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr));
     }
 
@@ -183 +186 @@
     cap_hdr = pjsip_evsub_get_allow_events_hdr(NULL);
     if (cap_hdr) {
-        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr));
+        pjsip_msg_add_hdr(tdata->msg, 
+                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr));
     }
 
@@ -1456 +1460 @@
 
     /* Make sure id is in range. */
-    PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
+    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata), 
+                     PJ_EINVAL);
 
     /* Make sure that transport exists */
@@ -1524 +1529 @@
 {
     /* Make sure id is in range. */
-    PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
+    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata), 
+                     PJ_EINVAL);
 
     /* Make sure that transport exists */
@@ -1547 +1553 @@
 
     /* Make sure id is in range. */
-    PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
+    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata), 
+                     PJ_EINVAL);
 
     /* Make sure that transport exists */
@@ -1640 +1647 @@
         pjsip_hdr *new_hdr;
 
-        new_hdr = pjsip_hdr_clone(tdata->pool, hdr);
+        new_hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, hdr);
         pjsip_msg_add_hdr(tdata->msg, new_hdr);
 
@@ -1672 +1679 @@
         pjsip_route_hdr *new_r;
 
-        new_r = pjsip_hdr_clone(tdata->pool, r);
+        new_r = (pjsip_route_hdr*) pjsip_hdr_clone(tdata->pool, r);
         pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)new_r);
 
@@ -1719 +1726 @@
         return;
 
-    pj_assert(tp_id >= 0 && tp_id < PJ_ARRAY_SIZE(pjsua_var.tpdata));
+    pj_assert(tp_id >= 0 && tp_id < (int)PJ_ARRAY_SIZE(pjsua_var.tpdata));
     tpdata = &pjsua_var.tpdata[tp_id];
 
@@ -1749 +1756 @@
     if (!pool) return -1;
 
-    url = pj_pool_alloc(pool, len+1);
+    url = (char*) pj_pool_alloc(pool, len+1);
     pj_ansi_strcpy(url, c_url);