Work around a bug in gcc 2.95's STL implementation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9638 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-02-15 18:56:13 +00:00
parent 0641903bd1
commit 36fed001c4
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2005-02-15 Angus Leeming <leeming@lyx.org>
* filetools.C (setEnvPath): compare iterators rather than use tellp().
2005-02-03 Angus Leeming <leeming@lyx.org>
* forkedcall.C (running): call the lyx::kill wrapper function

View File

@ -414,14 +414,15 @@ void setEnvPath(string const & name, vector<string> const & env)
{
char const separator(os::path_separator());
std::ostringstream ss;
vector<string>::const_iterator it = env.begin();
vector<string>::const_iterator const begin = env.begin();
vector<string>::const_iterator const end = env.end();
vector<string>::const_iterator it = begin;
for (; it != end; ++it) {
if (ss.tellp() > 0)
if (it != begin)
ss << separator;
ss << os::external_path(*it);
}
PutEnv(name + "=" + ss.str());
PutEnv(name + "=" + string(STRCONV(ss.str())));
}