Browse Source

compiler warning

Ken Martin 23 years ago
parent
commit
c1b92d2ea0
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Source/cmEndIfCommand.cxx
  2. 2 2
      Source/cmLocalUnixMakefileGenerator.cxx

+ 1 - 1
Source/cmEndIfCommand.cxx

@@ -17,7 +17,7 @@
 #include "cmEndIfCommand.h"
 #include "cmCacheManager.h"
 
-bool cmEndIfCommand::InitialPass(std::vector<std::string> const& args)
+bool cmEndIfCommand::InitialPass(std::vector<std::string> const&)
 {
   this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
   return false;

+ 2 - 2
Source/cmLocalUnixMakefileGenerator.cxx

@@ -406,11 +406,11 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
     }
   fout << "\n\n";
   const char * qt_files = m_Makefile->GetDefinition("GENERATED_QT_FILES");
-  if (m_Makefile->GetDefinition("GENERATED_QT_FILES")!=NULL && 
+  if (qt_files != NULL && 
       strlen(m_Makefile->GetDefinition("GENERATED_QT_FILES"))>0)
     {
     fout << "GENERATED_QT_FILES = ";
-    fout << m_Makefile->GetDefinition("GENERATED_QT_FILES");
+    fout << qt_files;
     fout << "\n\n";
     }
 }