diff options
| author | Edwin Vane <edwin.vane@intel.com> | 2013-08-14 15:09:44 +0000 |
|---|---|---|
| committer | Edwin Vane <edwin.vane@intel.com> | 2013-08-14 15:09:44 +0000 |
| commit | bc7dc8d51f1b5bc8cf9e31dec2d41c2e40614051 (patch) | |
| tree | 4fa6d99a35e40cb973da8b75d5858d0c77c91e70 /clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp | |
| parent | c04548f8b3d370fb5259d5326253c3bf56f38f92 (diff) | |
| download | bcm5719-llvm-bc7dc8d51f1b5bc8cf9e31dec2d41c2e40614051.tar.gz bcm5719-llvm-bc7dc8d51f1b5bc8cf9e31dec2d41c2e40614051.zip | |
cpp11-migrate: Fix silly logic error preventing multiple transforms
A missed clause in an error test added in r188371 caused any use of the
migrator requesting multiple transforms to fail.
llvm-svn: 188374
Diffstat (limited to 'clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp')
| -rw-r--r-- | clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp b/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp index 22a7be9e3f6..4db2d1e915a 100644 --- a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp +++ b/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp @@ -264,7 +264,8 @@ int main(int argc, const char **argv) { return 1; } - if (std::distance(TransformManager.begin(), TransformManager.end()) > 1) { + if (std::distance(TransformManager.begin(), TransformManager.end()) > 1 && + YAMLOnly) { llvm::errs() << "Header change description files requested for multiple " "transforms.\nChanges from only one transform can be " "recorded in a change description file.\n"; |

