[Libreoffice-commits] core.git: configmgr/source

Julien Nabet serval2412 at yahoo.fr
Fri Oct 13 05:05:33 UTC 2017


 configmgr/source/components.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a5a905e7ff2e3a19020b6c486e77695aece71b8c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Oct 12 23:55:20 2017 +0200

    Replace list by vector in components (configmgr)
    
    Change-Id: I772b9b1b1d8fdbbc1dc7e38904490a6533686a90
    Reviewed-on: https://gerrit.libreoffice.org/43353
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 3b4111bc0fb9..7459ef4e5d45 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <chrono>
 #include <cstddef>
-#include <list>
+#include <vector>
 #include <set>
 
 #include <com/sun/star/beans/Optional.hpp>
@@ -79,17 +79,17 @@ namespace configmgr {
 
 namespace {
 
-struct UnresolvedListItem {
+struct UnresolvedVectorItem {
     OUString name;
     rtl::Reference< ParseManager > manager;
 
-    UnresolvedListItem(
+    UnresolvedVectorItem(
         OUString const & theName,
         rtl::Reference< ParseManager > const & theManager):
         name(theName), manager(theManager) {}
 };
 
-typedef std::list< UnresolvedListItem > UnresolvedList;
+typedef std::vector< UnresolvedVectorItem > UnresolvedVector;
 
 void parseXcsFile(
     OUString const & url, int layer, Data & data, Partial const * partial,
@@ -750,7 +750,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
         throw css::uno::RuntimeException(
             "cannot open directory " + url);
     }
-    UnresolvedList unres;
+    UnresolvedVector unres;
     std::set< OUString > existingDeps;
     std::set< OUString > processedDeps;
     for (;;) {
@@ -794,7 +794,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
     }
     while (!unres.empty()) {
         bool isResolved = false;
-        for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) {
+        for (UnresolvedVector::iterator i(unres.begin()); i != unres.end();) {
             if (i->manager->parse(&existingDeps)) {
                 processedDeps.insert(i->name);
                 i = unres.erase(i);


More information about the Libreoffice-commits mailing list