Ignore:
Timestamp:
May 11, 2007 3:14:34 PM (14 years ago)
Author:
bennylp
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r1248 r1266  
    165165    cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_ALLOW, NULL); 
    166166    if (cap_hdr) { 
    167         pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr)); 
     167        pjsip_msg_add_hdr(tdata->msg,  
     168                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr)); 
    168169    } 
    169170 
     
    171172    cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_ACCEPT, NULL); 
    172173    if (cap_hdr) { 
    173         pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr)); 
     174        pjsip_msg_add_hdr(tdata->msg,  
     175                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr)); 
    174176    } 
    175177 
     
    177179    cap_hdr = pjsip_endpt_get_capability(pjsua_var.endpt, PJSIP_H_SUPPORTED, NULL); 
    178180    if (cap_hdr) { 
    179         pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr)); 
     181        pjsip_msg_add_hdr(tdata->msg,  
     182                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr)); 
    180183    } 
    181184 
     
    183186    cap_hdr = pjsip_evsub_get_allow_events_hdr(NULL); 
    184187    if (cap_hdr) { 
    185         pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, cap_hdr)); 
     188        pjsip_msg_add_hdr(tdata->msg,  
     189                          (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, cap_hdr)); 
    186190    } 
    187191 
     
    14561460 
    14571461    /* Make sure id is in range. */ 
    1458     PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL); 
     1462    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata),  
     1463                     PJ_EINVAL); 
    14591464 
    14601465    /* Make sure that transport exists */ 
     
    15241529{ 
    15251530    /* Make sure id is in range. */ 
    1526     PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL); 
     1531    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata),  
     1532                     PJ_EINVAL); 
    15271533 
    15281534    /* Make sure that transport exists */ 
     
    15471553 
    15481554    /* Make sure id is in range. */ 
    1549     PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL); 
     1555    PJ_ASSERT_RETURN(id>=0 && id<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata),  
     1556                     PJ_EINVAL); 
    15501557 
    15511558    /* Make sure that transport exists */ 
     
    16401647        pjsip_hdr *new_hdr; 
    16411648 
    1642         new_hdr = pjsip_hdr_clone(tdata->pool, hdr); 
     1649        new_hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, hdr); 
    16431650        pjsip_msg_add_hdr(tdata->msg, new_hdr); 
    16441651 
     
    16721679        pjsip_route_hdr *new_r; 
    16731680 
    1674         new_r = pjsip_hdr_clone(tdata->pool, r); 
     1681        new_r = (pjsip_route_hdr*) pjsip_hdr_clone(tdata->pool, r); 
    16751682        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)new_r); 
    16761683 
     
    17191726        return; 
    17201727 
    1721     pj_assert(tp_id >= 0 && tp_id < PJ_ARRAY_SIZE(pjsua_var.tpdata)); 
     1728    pj_assert(tp_id >= 0 && tp_id < (int)PJ_ARRAY_SIZE(pjsua_var.tpdata)); 
    17221729    tpdata = &pjsua_var.tpdata[tp_id]; 
    17231730 
     
    17491756    if (!pool) return -1; 
    17501757 
    1751     url = pj_pool_alloc(pool, len+1); 
     1758    url = (char*) pj_pool_alloc(pool, len+1); 
    17521759    pj_ansi_strcpy(url, c_url); 
    17531760 
Note: See TracChangeset for help on using the changeset viewer.