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.

2 files changed, 9 insertions, 13 deletions

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index ea45e3c..a422a98 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;
diff --git a/Source/cmDependsFortran.h b/Source/cmDependsFortran.h
index db2df19..d6ec7d7 100644
--- a/Source/cmDependsFortran.h
+++ b/Source/cmDependsFortran.h
@@ -73,7 +73,7 @@ protected:
   // The source file from which to start scanning.
   std::string SourceFile;
 
-  std::vector<std::string> PPDefinitions;
+  std::set<std::string> PPDefinitions;
 
   // Internal implementation details.
   cmDependsFortranInternals* Internal;