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/cmVSSetupHelper.h | |
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/cmVSSetupHelper.h')
-rw-r--r-- | Source/cmVSSetupHelper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h index c07cfaf..368341c 100644 --- a/Source/cmVSSetupHelper.h +++ b/Source/cmVSSetupHelper.h @@ -4,7 +4,7 @@ #define cmVSSetupHelper_h #ifndef NOMINMAX -#define NOMINMAX // Undefine min and max defined by windows.h +# define NOMINMAX // Undefine min and max defined by windows.h #endif // Published by Visual Studio Setup team @@ -97,6 +97,7 @@ public: operator BSTR() const { return str; } BSTR* operator&() throw() { return &str; } ~SmartBSTR() throw() { ::SysFreeString(str); } + private: BSTR str; }; |