diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2018-06-01 16:53:33 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:12 (GMT) |
commit | 3af8c7715b359affce99c575bdcb84ca87585bb2 (patch) | |
tree | bb551a6063ccc08c1fdae71d0a6cd592e369c906 /Encoding.hxx.in | |
parent | 1f52cb087aeb1eef7082884df6423b749e7f50c1 (diff) | |
download | CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.zip CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.tar.gz CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.tar.bz2 |
KWSys 2018-06-01 (8ef62b28)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 8ef62b289e0a99856893ef49106c2b2d94e9dd0c (master).
Upstream Shortlog
-----------------
Brad King (2):
6b9c233c clang-format.bash: update to clang-format-6.0
b7a341cf Empty commit at end of history preceding clang-format-6.0 style transition
Kitware Robot (1):
828b6837 Revise C++ coding style using clang-format-6.0
Diffstat (limited to 'Encoding.hxx.in')
-rw-r--r-- | Encoding.hxx.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Encoding.hxx.in b/Encoding.hxx.in index 09691fd..b067521 100644 --- a/Encoding.hxx.in +++ b/Encoding.hxx.in @@ -41,9 +41,9 @@ public: std::vector<char*> argv_; }; -/** - * Convert between char and wchar_t - */ + /** + * Convert between char and wchar_t + */ #if @KWSYS_NAMESPACE@_STL_HAS_WSTRING @@ -59,7 +59,7 @@ public: static std::string ToNarrow(const std::wstring& str); static std::string ToNarrow(const wchar_t* str); -#if defined(_WIN32) +# if defined(_WIN32) /** * Convert the path to an extended length path to avoid MAX_PATH length * limitations on Windows. If the input is a local path the result will be @@ -68,7 +68,7 @@ public: * absolute paths with Windows-style backslashes. **/ static std::wstring ToWindowsExtendedPath(std::string const&); -#endif +# endif #endif // @KWSYS_NAMESPACE@_STL_HAS_WSTRING |