diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
| commit | 6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch) | |
| tree | 1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/cmGeneratorExpressionDAGChecker.cxx | |
| parent | c903b5319bfcf383964c625bb84d7bc958aba2e9 (diff) | |
| parent | 6313be44aa465ea883e3578b3a0424ae0c217d5c (diff) | |
| download | CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.zip CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.bz2 | |
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/cmGeneratorExpressionDAGChecker.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index e7e1d34..07efba9 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -42,12 +42,12 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( ) #undef TEST_TRANSITIVE_PROPERTY_METHOD { - std::map<cmStdString, std::set<cmStdString> >::const_iterator it + std::map<std::string, std::set<std::string> >::const_iterator it = top->Seen.find(target); if (it != top->Seen.end()) { - const std::set<cmStdString> &propSet = it->second; - const std::set<cmStdString>::const_iterator i = propSet.find(property); + const std::set<std::string> &propSet = it->second; + const std::set<std::string>::const_iterator i = propSet.find(property); if (i != propSet.end()) { this->CheckResult = ALREADY_SEEN; @@ -92,7 +92,7 @@ void cmGeneratorExpressionDAGChecker::ReportError( << "Self reference on target \"" << context->HeadTarget->GetName() << "\".\n"; context->Makefile->GetCMakeInstance() - ->IssueMessage(cmake::FATAL_ERROR, e.str().c_str(), + ->IssueMessage(cmake::FATAL_ERROR, e.str(), parent->Backtrace); return; } @@ -103,7 +103,7 @@ void cmGeneratorExpressionDAGChecker::ReportError( << " " << expr << "\n" << "Dependency loop found."; context->Makefile->GetCMakeInstance() - ->IssueMessage(cmake::FATAL_ERROR, e.str().c_str(), + ->IssueMessage(cmake::FATAL_ERROR, e.str(), context->Backtrace); } @@ -116,7 +116,7 @@ void cmGeneratorExpressionDAGChecker::ReportError( << (parent->Content ? parent->Content->GetOriginalExpression() : expr) << "\n"; context->Makefile->GetCMakeInstance() - ->IssueMessage(cmake::FATAL_ERROR, e.str().c_str(), + ->IssueMessage(cmake::FATAL_ERROR, e.str(), parent->Backtrace); parent = parent->Parent; ++loopStep; |