Changeset 1266 for pjproject/trunk/pjsip/src/test-pjsip/tsx_uac_test.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/test-pjsip/tsx_uac_test.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/test-pjsip/tsx_uac_test.c

@@ -365 +365 @@
                 PJ_LOG(3,(THIS_FILE, 
                           "    error: prev state is %s instead of %s",
-                          pjsip_tsx_state_str(e->body.tsx_state.prev_state),
+                          pjsip_tsx_state_str((pjsip_tsx_state_e)e->body.tsx_state.prev_state),
                           pjsip_tsx_state_str(PJSIP_TSX_STATE_PROCEEDING)));
                 test_complete = -739;
@@ -548 +548 @@
                                     struct pj_timer_entry *entry)
 {
-    struct response *r = entry->user_data;
+    struct response *r = (struct response*) entry->user_data;
     pjsip_transport *tp = r->res_addr.transport;
 
@@ -760 +760 @@
 
         /* Schedule sending final response in couple of of secs. */
-        r = pj_pool_alloc(tdata->pool, sizeof(*r));
+        r = PJ_POOL_ALLOC_T(tdata->pool, struct response);
         r->res_addr = res_addr;
         r->tdata = tdata;
@@ -881 +881 @@
 
             /* Schedule sending final response in couple of of secs. */
-            r = pj_pool_alloc(tdata->pool, sizeof(*r));
+            r = PJ_POOL_ALLOC_T(tdata->pool, struct response);
             r->res_addr = res_addr;
             r->tdata = tdata;
@@ -969 +969 @@
 
     /* Set the branch param for test 1. */
-    via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
+    via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
     via->branch_param = pj_str(branch_param);
 
@@ -1098 +1098 @@
     enabled = msg_logger_set_enabled(0);
 
-    for (i=0; i<PJ_ARRAY_SIZE(sub_test); ++i) {
+    for (i=0; i<(int)PJ_ARRAY_SIZE(sub_test); ++i) {
 
         PJ_LOG(3,(THIS_FILE, 
@@ -1232 +1232 @@
 
 
-    for (i=0; i<PJ_ARRAY_SIZE(delay); ++i) {
+    for (i=0; i<(int)PJ_ARRAY_SIZE(delay); ++i) {
 
         PJ_LOG(3,(THIS_FILE, 
@@ -1303 +1303 @@
 
     /* Do the test. */
-    for (i=0; i<PJ_ARRAY_SIZE(delay); ++i) {
+    for (i=0; i<(int)PJ_ARRAY_SIZE(delay); ++i) {
         
         if (test_param->type == PJSIP_TRANSPORT_LOOP_DGRAM) {
@@ -1344 +1344 @@
 
     /* Get transport flag */
-    tp_flag = pjsip_transport_get_flag_from_type(test_param->type);
+    tp_flag = pjsip_transport_get_flag_from_type((pjsip_transport_type_e)test_param->type);
 
     pj_ansi_sprintf(TARGET_URI, "sip:bob@127.0.0.1:%d;transport=%s",