Changeset 1266 for pjproject/trunk/pjsip/src/pjsip-ua/sip_replaces.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/pjsip-ua/sip_replaces.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_replaces.c

@@ -53 +53 @@
 PJ_DEF(pjsip_replaces_hdr*) pjsip_replaces_hdr_create(pj_pool_t *pool)
 {
-    pjsip_replaces_hdr *hdr = pj_pool_zalloc(pool, sizeof(*hdr));
+    pjsip_replaces_hdr *hdr = PJ_POOL_ZALLOC_T(pool, pjsip_replaces_hdr);
     hdr->type = PJSIP_H_OTHER;
     hdr->name.ptr = "Replaces";
@@ -109 +109 @@
                             const pjsip_replaces_hdr *rhs )
 {
-    pjsip_replaces_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_replaces_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_replaces_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param);
@@ -145 +145 @@
             hdr->early_only = PJ_TRUE;
         } else {
-            pjsip_param *param = pj_pool_alloc(ctx->pool, sizeof(pjsip_param));
+            pjsip_param *param = PJ_POOL_ALLOC_T(ctx->pool, pjsip_param);
             param->name = pname;
             param->value = pvalue;
@@ -319 +319 @@
                 pjsip_hdr *cloned;
 
-                cloned = pjsip_hdr_clone(tdata->pool, h);
+                cloned = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, h);
                 PJ_ASSERT_RETURN(cloned, PJ_ENOMEM);