kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Replace deques with vectors.

This commit is contained in:
Stephen Kelly 2015-05-17 23:12:16 +02:00
parent 00ccfff2bc
commit 9b4aefad41
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@ -4371,7 +4371,7 @@ std::string cmMakefile::GetListFileStack() const
size_t depth = this->ListFileStack.size(); size_t depth = this->ListFileStack.size();
if (depth > 0) if (depth > 0)
{ {
std::deque<std::string>::const_iterator it = this->ListFileStack.end(); std::vector<std::string>::const_iterator it = this->ListFileStack.end();
do do
{ {
if (depth != this->ListFileStack.size()) if (depth != this->ListFileStack.size())

5
Source/cmMakefile.h
View File

@ -35,7 +35,6 @@
#endif #endif
#include <stack> #include <stack>
#include <deque>
class cmFunctionBlocker; class cmFunctionBlocker;
class cmCommand; class cmCommand;
@ -963,7 +962,7 @@ private:
bool CheckSystemVars; bool CheckSystemVars;
// stack of list files being read // stack of list files being read
std::deque<std::string> ListFileStack; std::vector<std::string> ListFileStack;
// stack of commands being invoked. // stack of commands being invoked.
struct CallStackEntry struct CallStackEntry
@ -971,7 +970,7 @@ private:
cmListFileContext const* Context; cmListFileContext const* Context;
cmExecutionStatus* Status; cmExecutionStatus* Status;
}; };
typedef std::deque<CallStackEntry> CallStackType; typedef std::vector<CallStackEntry> CallStackType;
CallStackType CallStack; CallStackType CallStack;
friend class cmMakefileCall; friend class cmMakefileCall;