Attachment #88397 for bug #116030

Lines 103-108 Link Here

(-)speech_tools/include/EST_Chunk.h (+9 lines)
103	/* */	103	/* */
104	/************************************************************************/	104	/************************************************************************/
105		105
		106	class EST_ChunkPtr;
		107
106	class EST_Chunk {	108	class EST_Chunk {
107	public:	109	public:
108	typedef unsigned short use_counter;	110	typedef unsigned short use_counter;
Lines 152-157 class EST_Chunk { Link Here
152	/* */	154	/* */
153	/************************************************************************/	155	/************************************************************************/
154		156
		157	EST_ChunkPtr chunk_allocate(int bytes);
		158	EST_ChunkPtr chunk_allocate(int bytes, const char *initial, int initial_len);
		159	EST_ChunkPtr chunk_allocate(int bytes, const EST_ChunkPtr &initial, int initial_start, int initial_len);
		160
		161	void make_updatable(EST_ChunkPtr &shared, EST_Chunk::EST_chunk_size inuse);
		162	void make_updatable(EST_ChunkPtr &shared);
		163
155	class EST_ChunkPtr {	164	class EST_ChunkPtr {
156	private:	165	private:
157	EST_Chunk *ptr;	166	EST_Chunk *ptr;

Lines 79-84 use we envisage. Traversal of the items Link Here

(-)speech_tools/include/ling_class/EST_Item.h (+3 lines)
79		79
80	*/	80	*/
81		81
		82	class EST_Item;
		83	int same_item(const EST_Item l1,const EST_Item l2);
		84
82	class EST_Item	85	class EST_Item
83	{	86	{
84	private:	87	private:

Lines 89-95 EST_Pathname EST_Pathname::as_directory( Link Here

(-)./speech_tools/base_class/EST_Pathname_unix.cc (-1 / +1 lines)
89	return *this;	89	return *this;
90		90
91	if (length() > 0)	91	if (length() > 0)
92	return ::operator +(EST_String(*this), "/");	92	return EST_String(*this) + "/";
93		93
94	return "./";	94	return "./";
95	}	95	}

Lines 83-91 class CLDB { Link Here

(-)festival/src/modules/clunits/clunits.h (-2 / +2 lines)
83	CLfile *get_fileitem(const EST_String &name)	83	CLfile *get_fileitem(const EST_String &name)
84	{ return (CLfile *)fileindex.lookup(name); }	84	{ return (CLfile *)fileindex.lookup(name); }
85	void load_coefs_sig(EST_Item *unit);	85	void load_coefs_sig(EST_Item *unit);
86	CLfile *CLDB::get_file_coefs_sig(const EST_String &fileid);	86	CLfile *get_file_coefs_sig(const EST_String &fileid);
87	void load_join_coefs(CLunit *unit);	87	void load_join_coefs(CLunit *unit);
88	CLfile *CLDB::get_file_join_coefs(const EST_String &fileid);	88	CLfile *get_file_join_coefs(const EST_String &fileid);
89	};	89	};
90		90
91		91




/** Object oriented approach for better and for worse... 
*/

#include <ostream>
#include "EST_TList.h"
#include "ling_class/EST_Item.h"

class EST_JoinCost;
class ostream;

class EST_JoinCostCache {
public:

Return to bug 116030

Lines 56-66 Link Here

(-)festival/src/modules/MultiSyn/EST_JoinCostCache.h (-1 / +1 lines)
56	/** Object oriented approach for better and for worse...	56	/** Object oriented approach for better and for worse...
57	*/	57	*/
58		58
		59	#include <ostream>
59	#include "EST_TList.h"	60	#include "EST_TList.h"
60	#include "ling_class/EST_Item.h"	61	#include "ling_class/EST_Item.h"
61		62
62	class EST_JoinCost;	63	class EST_JoinCost;
63	class ostream;
64		64
65	class EST_JoinCostCache {	65	class EST_JoinCostCache {
66	public:	66	public: