[asterisk-commits] russell: branch group/asterisk-cpp r168385 - /team/group/asterisk-cpp/main/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jan 10 15:46:22 2009
New Revision: 168385

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168385
Log:
stuff

Modified:
    team/group/asterisk-cpp/main/astobj2.c

Modified: team/group/asterisk-cpp/main/astobj2.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/astobj2.c?view=diff&rev=168385&r1=168384&r2=168385
==============================================================================
--- team/group/asterisk-cpp/main/astobj2.c (original)
+++ team/group/asterisk-cpp/main/astobj2.c Sat Jan 10 15:46:22 2009
@@ -302,7 +302,7 @@
 	if (data_size < sizeof(void *))
 		data_size = sizeof(void *);
 
-	obj = ast_calloc(1, sizeof(*obj) + data_size);
+	obj = (struct astobj2 *) ast_calloc(1, sizeof(*obj) + data_size);
 
 	if (obj == NULL)
 		return NULL;
@@ -436,7 +436,7 @@
 	/* XXX maybe consistency check on arguments ? */
 	/* compute the container size */
 	size_t container_size = sizeof(struct ao2_container) + n_buckets * sizeof(struct bucket);
-	struct ao2_container *c = _ao2_alloc_debug(container_size, container_destruct_debug, tag, file, line, funcname);
+	struct ao2_container *c = (struct ao2_container *) _ao2_alloc_debug(container_size, container_destruct_debug, tag, file, line, funcname);
 
 	return __ao2_container_alloc(c, n_buckets, hash_fn, cmp_fn);
 }
@@ -449,7 +449,7 @@
 	/* compute the container size */
 
 	size_t container_size = sizeof(struct ao2_container) + n_buckets * sizeof(struct bucket);
-	struct ao2_container *c = _ao2_alloc(container_size, container_destruct);
+	struct ao2_container *c = (struct ao2_container *) _ao2_alloc(container_size, container_destruct);
 
 	return __ao2_container_alloc(c, n_buckets, hash_fn, cmp_fn);
 }
@@ -490,7 +490,7 @@
 	if (INTERNAL_OBJ(c) == NULL)
 		return NULL;
 
-	p = ast_calloc(1, sizeof(*p));
+	p = (struct bucket_list *) ast_calloc(1, sizeof(*p));
 	if (!p)
 		return NULL;
 
@@ -547,7 +547,7 @@
 	if (INTERNAL_OBJ(user_data) == NULL)	/* safety check on the argument */
 		return NULL;
 
-	_ao2_callback_debug(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, ao2_match_by_addr, user_data, tag, file, line, funcname);
+	_ao2_callback_debug(c, (enum search_flags) (OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA), ao2_match_by_addr, user_data, tag, file, line, funcname);
 
 	return NULL;
 }
@@ -557,7 +557,7 @@
 	if (INTERNAL_OBJ(user_data) == NULL)	/* safety check on the argument */
 		return NULL;
 
-	_ao2_callback(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, ao2_match_by_addr, user_data);
+	_ao2_callback(c, (enum search_flags) (OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA), ao2_match_by_addr, user_data);
 
 	return NULL;
 }