From c497c4ca4d7068fb9bdd965bbace7d5216f8fd59 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 1 Sep 2017 18:55:36 +0200 Subject: Replace list by vector in dllmgr-x86-x64 (basic) Change-Id: I169590700474100e88f2e287f205ce7cbadedabe Reviewed-on: https://gerrit.libreoffice.org/41797 Tested-by: Jenkins Reviewed-by: Julien Nabet --- basic/source/runtime/dllmgr-x64.cxx | 7 +++---- basic/source/runtime/dllmgr-x86.cxx | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'basic/source') diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx index fbd2d4948a32..a0902dad034c 100644 --- a/basic/source/runtime/dllmgr-x64.cxx +++ b/basic/source/runtime/dllmgr-x64.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -108,8 +107,8 @@ public: const MarshalData& operator=(const MarshalData&) = delete; std::vector< char > * newBlob() { - blobs_.push_front(std::vector< char >()); - return &blobs_.front(); + blobs_.push_back(std::vector< char >()); + return &blobs_.back(); } std::vector< UnmarshalData > unmarshal; @@ -117,7 +116,7 @@ public: std::vector< StringData > unmarshalStrings; private: - std::list< std::vector< char > > blobs_; + std::vector< std::vector< char > > blobs_; }; std::size_t align(std::size_t address, std::size_t alignment) { diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx index 2f3203e72751..5f752dfced93 100644 --- a/basic/source/runtime/dllmgr-x86.cxx +++ b/basic/source/runtime/dllmgr-x86.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -116,8 +115,8 @@ public: const MarshalData& operator=(const MarshalData&) = delete; std::vector< char > * newBlob() { - blobs_.push_front(std::vector< char >()); - return &blobs_.front(); + blobs_.push_back(std::vector< char >()); + return &blobs_.back(); } std::vector< UnmarshalData > unmarshal; @@ -125,7 +124,7 @@ public: std::vector< StringData > unmarshalStrings; private: - std::list< std::vector< char > > blobs_; + std::vector< std::vector< char > > blobs_; }; std::size_t align(std::size_t address, std::size_t alignment) { -- cgit