[asterisk-commits] russell: trunk r66776 - in /trunk: ./ include/asterisk/ res/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu May 31 13:43:59 2007
New Revision: 66776

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66776
Log:
Merged revisions 66775 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66775 | russell | 2007-05-31 13:41:58 -0500 (Thu, 31 May 2007) | 3 lines

Change a couple of header files to not use "new", which is a reserved keyword
in C++.  (issue #9830, reported by osk)

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/app.h
    trunk/include/asterisk/speech.h
    trunk/res/res_speech.c

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

Modified: trunk/include/asterisk/app.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/app.h?view=diff&rev=66776&r1=66775&r2=66776
==============================================================================
--- trunk/include/asterisk/app.h (original)
+++ trunk/include/asterisk/app.h Thu May 31 13:43:59 2007
@@ -228,7 +228,7 @@
 int ast_app_group_discard(struct ast_channel *chan);
 
 /*! Update all group counting for a channel to a new one */
-int ast_app_group_update(struct ast_channel *old, struct ast_channel *new);
+int ast_app_group_update(struct ast_channel *oldchan, struct ast_channel *newchan);
 
 /*! Lock the group count list */
 int ast_app_group_list_lock(void);

Modified: trunk/include/asterisk/speech.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/speech.h?view=diff&rev=66776&r1=66775&r2=66776
==============================================================================
--- trunk/include/asterisk/speech.h (original)
+++ trunk/include/asterisk/speech.h Thu May 31 13:43:59 2007
@@ -73,7 +73,7 @@
 	/*! Name of speech engine */
 	char *name;
 	/*! Set up the speech structure within the engine */
-	int (*new)(struct ast_speech *speech);
+	int (*create)(struct ast_speech *speech);
 	/*! Destroy any data set on the speech structure by the engine */
 	int (*destroy)(struct ast_speech *speech);
 	/*! Load a local grammar on the speech structure */

Modified: trunk/res/res_speech.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_speech.c?view=diff&rev=66776&r1=66775&r2=66776
==============================================================================
--- trunk/res/res_speech.c (original)
+++ trunk/res/res_speech.c Thu May 31 13:43:59 2007
@@ -185,7 +185,7 @@
 	ast_speech_change_state(new_speech, AST_SPEECH_STATE_NOT_READY);
 
 	/* Pass ourselves to the engine so they can set us up some more and if they error out then do not create a structure */
-	if (engine->new(new_speech)) {
+	if (engine->create(new_speech)) {
 		ast_mutex_destroy(&new_speech->lock);
 		free(new_speech);
 		new_speech = NULL;
@@ -251,7 +251,7 @@
 	int res = 0;
 
 	/* Confirm the engine meets the minimum API requirements */
-	if (!engine->new || !engine->write || !engine->destroy) {
+	if (!engine->create || !engine->write || !engine->destroy) {
 		ast_log(LOG_WARNING, "Speech recognition engine '%s' did not meet minimum API requirements.\n", engine->name);
 		return -1;
 	}