aspell.C, aspell_local.h have been forgotten.
Is the attached patch correct (it compiles) and, if yes, can I apply it?
Jürgen.
Index: src/aspell.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/aspell.C,v
retrieving revision 1.8
diff -u -r1.8 aspell.C
--- src/aspell.C 12 Sep 2003 07:41:09 -0000 1.8
+++ src/aspell.C 7 Oct 2003 12:11:39 -0000
@@ -22,6 +22,8 @@
#include <boost/assert.hpp>
+using std::string;
+
ASpell::ASpell(BufferParams const &, string const & lang)
: els(0), spell_error_object(0)
Index: src/aspell_local.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/aspell_local.h,v
retrieving revision 1.2
diff -u -r1.2 aspell_local.h
--- src/aspell_local.h 23 Aug 2003 00:16:06 -0000 1.2
+++ src/aspell_local.h 7 Oct 2003 12:11:40 -0000
@@ -30,7 +30,7 @@
/**
* Initialise the spellchecker with the given buffer params and language.
*/
- ASpell(BufferParams const & params, string const & lang);
+ ASpell(BufferParams const & params, std::string const & lang);
virtual ~ASpell();
@@ -50,21 +50,21 @@
virtual void accept(WordLangTuple const &);
/// return the next near miss after a MISSED result
- virtual string const nextMiss();
+ virtual std::string const nextMiss();
/// give an error message on messy exit
- virtual string const error();
+ virtual std::string const error();
private:
/// add a speller of the given language
- void addSpeller(string const & lang);
+ void addSpeller(std::string const & lang);
struct Speller {
AspellSpeller * speller;
AspellConfig * config;
};
- typedef std::map<string, struct Speller> Spellers;
+ typedef std::map<std::string, struct Speller> Spellers;
/// the spellers
Spellers spellers_;
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- src/support/Makefile.am 6 Oct 2003 15:43:17 -0000 1.69
+++ src/support/Makefile.am 7 Oct 2003 12:11:43 -0000
@@ -27,7 +27,7 @@
copy.C \
copied_ptr.h \
cow_ptr.h \
- debugstream,h \
+ debugstream.h \
filename.C \
filename.h \
filetools.C \
