diff options
author | Brad King <brad.king@kitware.com> | 2015-07-22 13:45:28 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-07-27 09:45:35 -0400 |
commit | fd1944580266c3c84234b28e2102fc787ed5c00d (patch) | |
tree | 0b7e6f7f86140e49fd422c676d2f0f48e6bc7551 /Source/cmDependsFortran.cxx | |
parent | 295480b923338de82bdaa965aed9960d582a1750 (diff) | |
download | cmake-fd1944580266c3c84234b28e2102fc787ed5c00d.tar.gz |
cmDependsFortran: Simplify storage of preprocessor definitions
Collect the original preprocessor definitions in a std::set<> so that
it can be copied directly by cmFortranParser's constructor instead of
making a copy on the stack.
Diffstat (limited to 'Source/cmDependsFortran.cxx')
-rw-r--r-- | Source/cmDependsFortran.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index ea45e3c09b..a422a989f3 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -65,7 +65,7 @@ struct cmFortranFile struct cmFortranParser_s { cmFortranParser_s(std::vector<std::string> const& includes, - std::set<std::string>& ppDefines, + std::set<std::string> const& defines, cmFortranSourceInfo& info); ~cmFortranParser_s(); @@ -129,7 +129,7 @@ public: //---------------------------------------------------------------------------- cmDependsFortran::cmDependsFortran(): - PPDefinitions(0), Internal(0) + Internal(0) { } @@ -162,7 +162,7 @@ cmDependsFortran { def = it->substr(0, assignment); } - this->PPDefinitions.push_back(def); + this->PPDefinitions.insert(def); } } @@ -198,13 +198,9 @@ bool cmDependsFortran::WriteDependencies( cmFortranSourceInfo& info = this->Internal->CreateObjectInfo(obj.c_str(), src.c_str()); - // Make a copy of the macros defined via ADD_DEFINITIONS - std::set<std::string> ppDefines(this->PPDefinitions.begin(), - this->PPDefinitions.end()); - - // Create the parser object. The constructor takes ppMacro and info per - // reference, so we may look into the resulting objects later. - cmFortranParser parser(this->IncludePath, ppDefines, info); + // Create the parser object. The constructor takes info by reference, + // so we may look into the resulting objects later. + cmFortranParser parser(this->IncludePath, this->PPDefinitions, info); // Push on the starting file. cmFortranParser_FilePush(&parser, src.c_str()); @@ -931,9 +927,9 @@ bool cmFortranParser_s::FindIncludeFile(const char* dir, //---------------------------------------------------------------------------- cmFortranParser_s ::cmFortranParser_s(std::vector<std::string> const& includes, - std::set<std::string>& ppDefines, + std::set<std::string> const& defines, cmFortranSourceInfo& info): - IncludePath(includes), PPDefinitions(ppDefines), Info(info) + IncludePath(includes), PPDefinitions(defines), Info(info) { this->InInterface = 0; this->InPPFalseBranch = 0; |