The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 7740226c9f37468e53ba9fad60f02b286cb8b144 Author: Richard Heck <[email protected]> Date: Mon May 28 18:21:22 2012 -0400 A few more small optimizations noted along the way. (cherry picked from commit c1e3d795f62e88b6c5dda52fafba1404972fe8cc) Conflicts: src/tex2lyx/text.cpp diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index bdc31b3..3200845 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -1513,7 +1513,9 @@ void parse_environment(Parser & p, ostream & os, bool outer, if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); set<string> const & req = newlayout->requires(); - for (set<string>::const_iterator it = req.begin(); it != req.end(); ++it) + set<string>::const_iterator it = req.begin(); + set<string>::const_iterator en = req.end(); + for (; it != en; ++it) preamble.registerAutomaticallyLoadedPackage(*it); } @@ -2428,8 +2430,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); set<string> const & req = newlayout->requires(); - for (set<string>::const_iterator it = req.begin(); - it != req.end(); ++it) + set<string>::const_iterator it = req.begin(); + set<string>::const_iterator en = req.end(); + for (; it != en; ++it) preamble.registerAutomaticallyLoadedPackage(*it); } else handle_ert(os, ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/text.cpp | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
