← Back to branch summary

~ubuntu-branches/ubuntu/maverick/speech-tools/maverick

« back to all changes in this revision

Viewing changes to base_class/EST_Pathname_unix.cc

  • Committer: Bazaar Package Importer
  • Author(s): Kumar Appaiah, Kartik Mistry, Kumar Appaiah
  • Date: 2010-07-17 11:32:04 UTC
  • mfrom: (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100717113204-mnse3jo236j107q8
Tags: 1:2.0.95~beta-1
[ Kartik Mistry ]
* debian/control:
  + [Lintian] Added missing ${misc:Depends}
  + Updated Standards-Version to 3.8.4 (no changes needed)
* debian/patches/const_char.diff:
  + Added missing patch header
* Removed unused patch invalid_const_char_conversion_fixes.diff

[ Kumar Appaiah ]
* New upstream release.
* Standards Version is now 3.9.0 (No changes needed)
* Update debian/rules to specify version numbers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
base_class/EST_Pathname_unix.cc
148
148
EST_Pathname operator + (const char *p, const EST_Pathname addition) 
149
149
{return EST_Pathname::append(p, addition); }
150
150
 
151
 
EST_Pathname &operator += (EST_Pathname p, const EST_Pathname addition)
152
 
{ p = EST_Pathname::append(p, addition); return p; }
153
 
EST_Pathname &operator += (EST_Pathname p, const EST_String addition)
154
 
{ p = EST_Pathname::append(p, addition); return p; }
 
151
#if 0
 
152
EST_Pathname operator += (EST_Pathname p, const EST_Pathname addition)
 
153
{ EST_String q = EST_Pathname::append(p, addition); return q; }
 
154
EST_Pathname operator += (EST_Pathname p, const EST_String addition)
 
155
{ EST_String q = EST_Pathname::append(p, addition); return q; }
 
156
#endif
155
157
 
156
158
EST_Pathname EST_Pathname::append(EST_Pathname directory, EST_Pathname addition)
157
159
{