"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/EST_String.h" between
speech_tools-2.4-release.tar.gz and speech_tools-2.5.0-release.tar.gz

About: The speech_tools - Edinburgh Speech Tools Library (used by the Festival Speech Synthesis System).

EST_String.h  (speech_tools-2.4-release)	:	EST_String.h  (speech_tools-2.5.0-release)
skipping to change at line 67		skipping to change at line 67
* without worrying too much about the cost).		* without worrying too much about the cost).
*		*
* The associated class EST_Regex can be used to represent regular		* The associated class EST_Regex can be used to represent regular
* expressions.		* expressions.
*		*
* @see EST_Chunk		* @see EST_Chunk
* @see EST_Regex		* @see EST_Regex
* @see string_example		* @see string_example
* @author Alan W Black <awb@cstr.ed.ac.uk>		* @author Alan W Black <awb@cstr.ed.ac.uk>
* @author Richard Caley <rjc@cstr.ed.ac.uk>		* @author Richard Caley <rjc@cstr.ed.ac.uk>
* @version $Id: EST_String.h,v 1.10 2014/10/13 13:26:19 robert Exp $		* @version $Id: EST_String.h,v 1.11 2017/02/22 15:50:14 awb Exp $
*/		*/
class EST_String {		class EST_String {
/** For better libg++ compatibility.		/** For better libg++ compatibility.
*		*
* Includes String from char constructor which		* Includes String from char constructor which
* tends to mask errors in use. Also reverses the () and [] operators.		* tends to mask errors in use. Also reverses the () and [] operators.
*/		*/
# define __FSF_COMPATIBILITY__ (0)		# define __FSF_COMPATIBILITY__ (0)
skipping to change at line 218		skipping to change at line 218
/// Construct from C string.		/// Construct from C string.
EST_String(const char *s, int s_size, int start, int len);		EST_String(const char *s, int s_size, int start, int len);
// Create from EST_String		// Create from EST_String
EST_String(const EST_String &s, int start, int len);		EST_String(const EST_String &s, int start, int len);
/** Copy constructor		/** Copy constructor
* We have to declare our own copy constructor to lie to the		* We have to declare our own copy constructor to lie to the
* compiler about the constness of the RHS.		* compiler about the constness of the RHS.
*/		*/
		#if 0
EST_String(const EST_String &s) {		EST_String(const EST_String &s) {
memory = NON_CONST_CHUNKPTR(s.memory);		memory = NON_CONST_CHUNKPTR(s.memory);
size = s.size;		size = s.size;
}		}
		#endif
#if __FSF_COMPATIBILITY__		#if __FSF_COMPATIBILITY__
/** Construct from single char.		/** Construct from single char.
* This constructor is not usually included as it can mask errors.		* This constructor is not usually included as it can mask errors.
* @see __FSF_COMPATIBILITY__		* @see __FSF_COMPATIBILITY__
*/		*/
EST_String(const char c);		EST_String(const char c);
#endif		#endif
/// Destructor.		/// Destructor.
skipping to change at line 476		skipping to change at line 478
EST_String &operator += (const char *b);		EST_String &operator += (const char *b);
/// Add EST_String to end of EST_String		/// Add EST_String to end of EST_String
EST_String &operator += (const EST_String b);		EST_String &operator += (const EST_String b);
//@}		//@}
/**@name Assignment */		/**@name Assignment */
//@{		//@{
/// Assign C string to EST_String		/// Assign C string to EST_String
EST_String &operator = (const char *str);		EST_String &operator = (const char *str);
/// Assign single character to EST_String		/// Assign single character to EST_String
		#if 0
EST_String &operator = (const char c);		EST_String &operator = (const char c);
/// Assign EST_String to EST_String.		/// Assign EST_String to EST_String.
EST_String &operator = (const EST_String &s);		EST_String &operator = (const EST_String &s);
		#endif
//@}		//@}
/**@name Concatenation */		/**@name Concatenation */
//@{		//@{
/// Concatenate two EST_Strings		/// Concatenate two EST_Strings
friend EST_String operator + (const EST_String &a, const EST_String &b);		friend EST_String operator + (const EST_String &a, const EST_String &b);
/// Concatenate C String with EST_String		/// Concatenate C String with EST_String
friend EST_String operator + (const char *a, const EST_String &b);		friend EST_String operator + (const char *a, const EST_String &b);
/// Concatenate EST_String with C String		/// Concatenate EST_String with C String
friend EST_String operator + (const EST_String &a, const char *b);		friend EST_String operator + (const EST_String &a, const char *b);
End of changes. 5 change blocks.
1 lines changed or deleted		5 lines changed or added

---