浏览代码

COMP: fix some warnings

Ken Martin 17 年之前
父节点
当前提交
d7db2d086c
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 1 0
      Source/cmAddCustomTargetCommand.cxx
  2. 2 1
      Source/cmMakefile.cxx

+ 1 - 0
Source/cmAddCustomTargetCommand.cxx

@@ -48,6 +48,7 @@ bool cmAddCustomTargetCommand
         return false;
         return false;
         break;
         break;
       case cmPolicies::REQUIRED_IF_USED:
       case cmPolicies::REQUIRED_IF_USED:
+      case cmPolicies::REQUIRED_ALWAYS:
         this->SetError(
         this->SetError(
           this->Makefile->GetPolicies()->GetRequiredPolicyError
           this->Makefile->GetPolicies()->GetRequiredPolicyError
             (cmPolicies::CMP_0001).c_str());
             (cmPolicies::CMP_0001).c_str());

+ 2 - 1
Source/cmMakefile.cxx

@@ -3149,6 +3149,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
         case cmPolicies::OLD:
         case cmPolicies::OLD:
           return true;
           return true;
         case cmPolicies::REQUIRED_IF_USED:
         case cmPolicies::REQUIRED_IF_USED:
+        case cmPolicies::REQUIRED_ALWAYS:
           msg = this->GetPolicies()->
           msg = this->GetPolicies()->
             GetRequiredPolicyError(cmPolicies::CMP_0002);
             GetRequiredPolicyError(cmPolicies::CMP_0002);
           return false;
           return false;
@@ -3235,7 +3236,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
 cmPolicies::PolicyStatus cmMakefile
 cmPolicies::PolicyStatus cmMakefile
 ::GetPolicyStatus(cmPolicies::PolicyID id)
 ::GetPolicyStatus(cmPolicies::PolicyID id)
 {
 {
-  cmPolicies::PolicyStatus status;
+  cmPolicies::PolicyStatus status = cmPolicies::REQUIRED_IF_USED;
   PolicyMap::iterator mappos;
   PolicyMap::iterator mappos;
   unsigned int vecpos;
   unsigned int vecpos;
   bool done = false;
   bool done = false;