diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-05 13:49:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-05 13:49:41 (GMT) |
| commit | b605bdfd03ccb0c7003a110004afe7981853bc76 (patch) | |
| tree | f36c52e3462d6c16a954bba6760d321e91a9a56a /Source/CPack | |
| parent | 5a9f1b87c30870a6a705f882039b2b4e98126813 (diff) | |
| parent | 3e027d9def0f2d9f542cb71eda12e9527c418c9e (diff) | |
| download | CMake-b605bdfd03ccb0c7003a110004afe7981853bc76.zip CMake-b605bdfd03ccb0c7003a110004afe7981853bc76.tar.gz CMake-b605bdfd03ccb0c7003a110004afe7981853bc76.tar.bz2 | |
Merge topic 'vector-over-list'
3e027d9d c++: prefer vectors over lists
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !799
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/WiX/cmWIXPatchParser.h | 6 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h index c0c96cd..52c7e35 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.h +++ b/Source/CPack/WiX/cmWIXPatchParser.h @@ -7,8 +7,8 @@ #include "cmXMLParser.h" -#include <list> #include <map> +#include <vector> struct cmWIXPatchNode { @@ -36,7 +36,7 @@ struct cmWIXPatchElement : cmWIXPatchNode ~cmWIXPatchElement(); - typedef std::list<cmWIXPatchNode*> child_list_t; + typedef std::vector<cmWIXPatchNode*> child_list_t; typedef std::map<std::string, std::string> attributes_t; std::string name; @@ -84,7 +84,7 @@ private: fragment_map_t& Fragments; - std::list<cmWIXPatchElement*> ElementStack; + std::vector<cmWIXPatchElement*> ElementStack; }; #endif diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index a95ca76..c5495c6 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -6,7 +6,6 @@ #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" #include <algorithm> -#include <list> #include <utility> #include "cmCPackComponentGroup.h" @@ -314,7 +313,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( const std::string& tempDir = tempInstallDirectory; for (it = installDirectoriesVector.begin(); it != installDirectoriesVector.end(); ++it) { - std::list<std::pair<std::string, std::string> > symlinkedFiles; + std::vector<std::pair<std::string, std::string> > symlinkedFiles; cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl); cmsys::Glob gl; std::string top = *it; @@ -378,7 +377,8 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( } /* rebuild symlinks in the installed tree */ if (!symlinkedFiles.empty()) { - std::list<std::pair<std::string, std::string> >::iterator symlinkedIt; + std::vector<std::pair<std::string, std::string> >::iterator + symlinkedIt; std::string curDir = cmSystemTools::GetCurrentWorkingDirectory(); std::string goToDir = tempDir; goToDir += "/" + subdir; |