diff options
Diffstat (limited to 'Source/CPack/WiX/cmWIXSourceWriter.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXSourceWriter.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx index a86e28d1c..8e9bfdf3f 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx @@ -2,12 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWIXSourceWriter.h" -#include "cmCPackGenerator.h" +#include <windows.h> +#include "cmCPackGenerator.h" #include "cmUuid.h" -#include <windows.h> - cmWIXSourceWriter::cmWIXSourceWriter(cmCPackLog* logger, std::string const& filename, GuidType componentGuidType, @@ -32,7 +31,8 @@ cmWIXSourceWriter::cmWIXSourceWriter(cmCPackLog* logger, cmWIXSourceWriter::~cmWIXSourceWriter() { if (Elements.size() > 1) { - cmCPackLogger(cmCPackLog::LOG_ERROR, Elements.size() - 1 + cmCPackLogger(cmCPackLog::LOG_ERROR, + Elements.size() - 1 << " WiX elements were still open when closing '" << SourceFilename << "'" << std::endl); return; @@ -65,7 +65,8 @@ void cmWIXSourceWriter::EndElement(std::string const& name) } if (Elements.back() != name) { - cmCPackLogger(cmCPackLog::LOG_ERROR, "WiX element <" + cmCPackLogger(cmCPackLog::LOG_ERROR, + "WiX element <" << Elements.back() << "> can not be closed by </" << name << "> in '" << SourceFilename << "'" << std::endl); return; @@ -158,9 +159,7 @@ std::string cmWIXSourceWriter::EscapeAttributeValue(std::string const& value) std::string result; result.reserve(value.size()); - char c = 0; - for (size_t i = 0; i < value.size(); ++i) { - c = value[i]; + for (char c : value) { switch (c) { case '<': result += "<"; |