浏览代码

Undefine local preprocessor loop variables.

Most occurances of this pattern already contain the undef, so add it to
the rest too.
Stephen Kelly 11 年之前
父节点
当前提交
0f3e8e957f

+ 2 - 0
Source/cmExportTryCompileFileGenerator.cxx

@@ -36,6 +36,8 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
 
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 
+#undef FIND_TARGETS
+
       this->PopulateProperties(te, properties, emittedDeps);
       this->PopulateProperties(te, properties, emittedDeps);
 
 
       this->GenerateInterfaceProperties(te, os, properties);
       this->GenerateInterfaceProperties(te, os, properties);

+ 1 - 0
Source/cmGeneratorExpressionDAGChecker.cxx

@@ -40,6 +40,7 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
       CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(TEST_TRANSITIVE_PROPERTY_METHOD)
       CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(TEST_TRANSITIVE_PROPERTY_METHOD)
       false)
       false)
      )
      )
+#undef TEST_TRANSITIVE_PROPERTY_METHOD
     {
     {
     std::map<cmStdString, std::set<cmStdString> >::const_iterator it
     std::map<cmStdString, std::set<cmStdString> >::const_iterator it
                                                     = top->Seen.find(target);
                                                     = top->Seen.find(target);

+ 3 - 1
Source/cmGeneratorExpressionDAGChecker.h

@@ -56,7 +56,9 @@ struct cmGeneratorExpressionDAGChecker
 #define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) \
 #define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) \
   bool METHOD () const;
   bool METHOD () const;
 
 
-CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(DECLARE_TRANSITIVE_PROPERTY_METHOD)
+  CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(DECLARE_TRANSITIVE_PROPERTY_METHOD)
+
+#undef DECLARE_TRANSITIVE_PROPERTY_METHOD
 
 
   bool GetTransitivePropertiesOnly();
   bool GetTransitivePropertiesOnly();
   void SetTransitivePropertiesOnly()
   void SetTransitivePropertiesOnly()

+ 3 - 0
Source/cmGeneratorExpressionEvaluator.cxx

@@ -772,6 +772,8 @@ static const char* targetPropertyTransitiveWhitelist[] = {
   CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(TRANSITIVE_PROPERTY_NAME)
   CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(TRANSITIVE_PROPERTY_NAME)
 };
 };
 
 
+#undef TRANSITIVE_PROPERTY_NAME
+
 std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
 std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
                                   cmTarget const* target,
                                   cmTarget const* target,
                                   cmTarget const* headTarget,
                                   cmTarget const* headTarget,
@@ -999,6 +1001,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                                             ASSERT_TRANSITIVE_PROPERTY_METHOD)
                                             ASSERT_TRANSITIVE_PROPERTY_METHOD)
           false);
           false);
         }
         }
+#undef ASSERT_TRANSITIVE_PROPERTY_METHOD
       }
       }
 
 
     std::string linkedTargetsContent;
     std::string linkedTargetsContent;