[svn-commits] mjordan: trunk r420100 - in /trunk: ./ res/stasis/messaging.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Aug  5 16:48:05 2014
New Revision: 420100

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420100
Log:
stasis: Fix compilation issue with ao2 tagged objects
........

Merged revisions 420099 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/stasis/messaging.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/stasis/messaging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/stasis/messaging.c?view=diff&rev=420100&r1=420099&r2=420100
==============================================================================
--- trunk/res/stasis/messaging.c (original)
+++ trunk/res/stasis/messaging.c Tue Aug  5 16:48:05 2014
@@ -90,7 +90,7 @@
 
 	ast_assert(callback != NULL);
 
-	tuple = ao2_t_alloc(size, application_tuple_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
+	tuple = ao2_alloc_options(size, application_tuple_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
 	if (!tuple) {
 		return NULL;
 	}
@@ -122,7 +122,7 @@
 	struct message_subscription *sub;
 	size_t size = sizeof(*sub) + strlen(token) + 1;
 
-	sub = ao2_t_alloc(size, message_subscription_dtor, AO2_ALLOC_OPT_LOCK_RWLOCK);
+	sub = ao2_alloc_options(size, message_subscription_dtor, AO2_ALLOC_OPT_LOCK_RWLOCK);
 	if (!sub) {
 		return NULL;
 	}