Switch to unified view

a/src/utils/conftree.cpp b/src/utils/conftree.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid [] = "@(#$Id: conftree.cpp,v 1.10 2007-08-04 07:22:43 dockes Exp $  (C) 2003 J.F.Dockes";
2
static char rcsid [] = "@(#$Id: conftree.cpp,v 1.11 2007-09-27 11:02:13 dockes Exp $  (C) 2003 J.F.Dockes";
3
#endif
3
#endif
4
/*
4
/*
5
 *   This program is free software; you can redistribute it and/or modify
5
 *   This program is free software; you can redistribute it and/or modify
6
 *   it under the terms of the GNU General Public License as published by
6
 *   it under the terms of the GNU General Public License as published by
7
 *   the Free Software Foundation; either version 2 of the License, or
7
 *   the Free Software Foundation; either version 2 of the License, or
...
...
310
        fin = it;
310
        fin = it;
311
        break;
311
        break;
312
        }
312
        }
313
    }
313
    }
314
    }
314
    }
315
316
    // It may happen that the order entry already exists because erase doesnt
317
    // update m_order (fix it ?)
318
    if (find(start, fin, ConfLine(ConfLine::CFL_VAR, nm)) == fin)
315
    m_order.insert(fin, ConfLine(ConfLine::CFL_VAR, nm));
319
  m_order.insert(fin, ConfLine(ConfLine::CFL_VAR, nm));
316
320
317
    return 1;
321
    return 1;
318
}
322
}
319
323
320
int ConfSimple::erase(const string &nm, const string &sk)
324
int ConfSimple::erase(const string &nm, const string &sk)