[asterisk-commits] mmichelson: branch group/asterisk-cpp r168411 - /team/group/asterisk-cpp/incl...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Sat Jan 10 19:35:37 2009
New Revision: 168411

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168411
Log:
Make a change to the order of the init list for the
datastore constructor. This will make merges less likely
to conflict.


Modified:
    team/group/asterisk-cpp/include/asterisk/datastore.h

Modified: team/group/asterisk-cpp/include/asterisk/datastore.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/include/asterisk/datastore.h?view=diff&rev=168411&r1=168410&r2=168411
==============================================================================
--- team/group/asterisk-cpp/include/asterisk/datastore.h (original)
+++ team/group/asterisk-cpp/include/asterisk/datastore.h Sat Jan 10 19:35:37 2009
@@ -29,9 +29,10 @@
 			void (*destroy)(void *data) = NULL, 
 			void (*chan_fixup)(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan) = NULL,
 			void *(*duplicate)(void *data) = NULL) :
-			type(type), destroy(destroy), chan_fixup(chan_fixup), duplicate(duplicate) {}
+			type(type), duplicate(duplicate), destroy(destroy), chan_fixup(chan_fixup) {}
 
 	const char *type;			/*!< Type of data store */
+	void *(*duplicate)(void *data);		/*!< Duplicate item data (used for inheritance) */
 	void (*destroy)(void *data);		/*!< Destroy function */
 
 	/*!
@@ -49,7 +50,6 @@
 	 * \return nothing.
 	 */
 	void (*chan_fixup)(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
-	void *(*duplicate)(void *data);		/*!< Duplicate item data (used for inheritance) */
 };
 
 /*! \brief Structure for a data store object */