diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Utilities/Release | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Utilities/Release')
-rw-r--r-- | Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index d4f628c..4b17875 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -12,20 +12,17 @@ std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name) UINT status = MsiGetPropertyW(msi_handle, name.c_str(), L"", &size); - if(status == ERROR_MORE_DATA) - { + if (status == ERROR_MORE_DATA) { std::vector<wchar_t> buffer(size + 1); MsiGetPropertyW(msi_handle, name.c_str(), &buffer[0], &size); return std::wstring(&buffer[0]); - } - else - { + } else { return std::wstring(); - } + } } -void set_property(MSIHANDLE msi_handle, - std::wstring const& name, std::wstring const& value) +void set_property(MSIHANDLE msi_handle, std::wstring const& name, + std::wstring const& value) { MsiSetPropertyW(msi_handle, name.c_str(), value.c_str()); } @@ -37,10 +34,10 @@ extern "C" UINT __stdcall DetectNsisOverwrite(MSIHANDLE msi_handle) std::wstring uninstall_exe = install_root + L"\\uninstall.exe"; bool uninstall_exe_exists = - GetFileAttributesW(uninstall_exe.c_str()) != INVALID_FILE_ATTRIBUTES; + GetFileAttributesW(uninstall_exe.c_str()) != INVALID_FILE_ATTRIBUTES; set_property(msi_handle, L"CMAKE_NSIS_OVERWRITE_DETECTED", - uninstall_exe_exists ? L"1" : L"0"); + uninstall_exe_exists ? L"1" : L"0"); return ERROR_SUCCESS; } |