diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-26 12:56:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-26 12:57:04 (GMT) |
| commit | 6a8c765c8f6a6a62efe4b10c54d748870525ce1a (patch) | |
| tree | edb5305e6bee8d6d54ced2dfbc25094a01d8c9a7 /Source/cmcmd.cxx | |
| parent | 0278ec84d823b3d910cf5fc614b30b76984ac135 (diff) | |
| parent | 57132765e078a8654d1166d7d8a1c29ec01f47b4 (diff) | |
| download | CMake-6a8c765c8f6a6a62efe4b10c54d748870525ce1a.zip CMake-6a8c765c8f6a6a62efe4b10c54d748870525ce1a.tar.gz CMake-6a8c765c8f6a6a62efe4b10c54d748870525ce1a.tar.bz2 | |
Merge topic 'cm-array-begins-size'
57132765 Replace cmArray{Begin,End,Size} by their standard counterparts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1352
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index ed507fd..4810cd0 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -35,6 +35,7 @@ #include <algorithm> #include <functional> #include <iostream> +#include <iterator> #include <map> #include <memory> // IWYU pragma: keep #include <sstream> @@ -1013,8 +1014,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) } else if (cmHasLiteralPrefix(arg, "--format=")) { format = arg.substr(9); bool isKnown = - std::find(cmArrayBegin(knownFormats), cmArrayEnd(knownFormats), - format) != cmArrayEnd(knownFormats); + std::find(cm::cbegin(knownFormats), cm::cend(knownFormats), + format) != cm::cend(knownFormats); if (!isKnown) { cmSystemTools::Error("Unknown -E tar --format= argument: ", |