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/test-pjsip/tsx_uac_test.c

    r974 r1266  
    365365                PJ_LOG(3,(THIS_FILE,  
    366366                          "    error: prev state is %s instead of %s", 
    367                           pjsip_tsx_state_str(e->body.tsx_state.prev_state), 
     367                          pjsip_tsx_state_str((pjsip_tsx_state_e)e->body.tsx_state.prev_state), 
    368368                          pjsip_tsx_state_str(PJSIP_TSX_STATE_PROCEEDING))); 
    369369                test_complete = -739; 
     
    548548                                    struct pj_timer_entry *entry) 
    549549{ 
    550     struct response *r = entry->user_data; 
     550    struct response *r = (struct response*) entry->user_data; 
    551551    pjsip_transport *tp = r->res_addr.transport; 
    552552 
     
    760760 
    761761        /* Schedule sending final response in couple of of secs. */ 
    762         r = pj_pool_alloc(tdata->pool, sizeof(*r)); 
     762        r = PJ_POOL_ALLOC_T(tdata->pool, struct response); 
    763763        r->res_addr = res_addr; 
    764764        r->tdata = tdata; 
     
    881881 
    882882            /* Schedule sending final response in couple of of secs. */ 
    883             r = pj_pool_alloc(tdata->pool, sizeof(*r)); 
     883            r = PJ_POOL_ALLOC_T(tdata->pool, struct response); 
    884884            r->res_addr = res_addr; 
    885885            r->tdata = tdata; 
     
    969969 
    970970    /* Set the branch param for test 1. */ 
    971     via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL); 
     971    via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL); 
    972972    via->branch_param = pj_str(branch_param); 
    973973 
     
    10981098    enabled = msg_logger_set_enabled(0); 
    10991099 
    1100     for (i=0; i<PJ_ARRAY_SIZE(sub_test); ++i) { 
     1100    for (i=0; i<(int)PJ_ARRAY_SIZE(sub_test); ++i) { 
    11011101 
    11021102        PJ_LOG(3,(THIS_FILE,  
     
    12321232 
    12331233 
    1234     for (i=0; i<PJ_ARRAY_SIZE(delay); ++i) { 
     1234    for (i=0; i<(int)PJ_ARRAY_SIZE(delay); ++i) { 
    12351235 
    12361236        PJ_LOG(3,(THIS_FILE,  
     
    13031303 
    13041304    /* Do the test. */ 
    1305     for (i=0; i<PJ_ARRAY_SIZE(delay); ++i) { 
     1305    for (i=0; i<(int)PJ_ARRAY_SIZE(delay); ++i) { 
    13061306         
    13071307        if (test_param->type == PJSIP_TRANSPORT_LOOP_DGRAM) { 
     
    13441344 
    13451345    /* Get transport flag */ 
    1346     tp_flag = pjsip_transport_get_flag_from_type(test_param->type); 
     1346    tp_flag = pjsip_transport_get_flag_from_type((pjsip_transport_type_e)test_param->type); 
    13471347 
    13481348    pj_ansi_sprintf(TARGET_URI, "sip:bob@127.0.0.1:%d;transport=%s",  
Note: See TracChangeset for help on using the changeset viewer.