[asterisk-commits] russell: branch 1.4 r66775 - in /branches/1.4: include/asterisk/ res/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu May 31 13:41:58 2007
New Revision: 66775

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66775
Log:
Change a couple of header files to not use "new", which is a reserved keyword
in C++.  (issue #9830, reported by osk)

Modified:
    branches/1.4/include/asterisk/app.h
    branches/1.4/include/asterisk/speech.h
    branches/1.4/res/res_speech.c

Modified: branches/1.4/include/asterisk/app.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/app.h?view=diff&rev=66775&r1=66774&r2=66775
==============================================================================
--- branches/1.4/include/asterisk/app.h (original)
+++ branches/1.4/include/asterisk/app.h Thu May 31 13:41:58 2007
@@ -226,7 +226,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: branches/1.4/include/asterisk/speech.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/speech.h?view=diff&rev=66775&r1=66774&r2=66775
==============================================================================
--- branches/1.4/include/asterisk/speech.h (original)
+++ branches/1.4/include/asterisk/speech.h Thu May 31 13:41:58 2007
@@ -69,7 +69,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: branches/1.4/res/res_speech.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_speech.c?view=diff&rev=66775&r1=66774&r2=66775
==============================================================================
--- branches/1.4/res/res_speech.c (original)
+++ branches/1.4/res/res_speech.c Thu May 31 13:41:58 2007
@@ -237,7 +237,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;