diff options
author | Brad King <brad.king@kitware.com> | 2018-06-01 16:52:10 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 16:52:38 (GMT) |
commit | eed0df951d95d48e7856107175a2baba212c3206 (patch) | |
tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/CPack/WiX/cmWIXAccessControlList.cxx | |
parent | b671e4799f0e418448681a21120e8e87a97de5dc (diff) | |
parent | d7204e649ed4ebb19bb341b4e49eb51514364922 (diff) | |
download | CMake-eed0df951d95d48e7856107175a2baba212c3206.zip CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.gz CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.bz2 |
Merge topic 'clang-format-6.0'
d7204e649e Revise C++ coding style using clang-format-6.0
12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition
523c443d13 clang-format.bash: update to clang-format-6.0
eb7ec19c1c clang-format: Add comments to suppress some formatting
b67a5bf175 Tests/VSWinStorePhone: Do not format managed source
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !2123
Diffstat (limited to 'Source/CPack/WiX/cmWIXAccessControlList.cxx')
-rw-r--r-- | Source/CPack/WiX/cmWIXAccessControlList.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.cxx b/Source/CPack/WiX/cmWIXAccessControlList.cxx index 1603bf8..563de02 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.cxx +++ b/Source/CPack/WiX/cmWIXAccessControlList.cxx @@ -66,8 +66,9 @@ void cmWIXAccessControlList::CreatePermissionElement(std::string const& entry) void cmWIXAccessControlList::ReportError(std::string const& entry, std::string const& message) { - cmCPackLogger(cmCPackLog::LOG_ERROR, "Failed processing ACL entry '" - << entry << "': " << message << std::endl); + cmCPackLogger(cmCPackLog::LOG_ERROR, + "Failed processing ACL entry '" << entry << "': " << message + << std::endl); } bool cmWIXAccessControlList::IsBooleanAttribute(std::string const& name) |