diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
| commit | 81870f1159a7b2649b027a6c3f75eba555831488 (patch) | |
| tree | 05eb767f2f2becb6480cfe348d08ebca4e1fc1cf /Source/kwsys/Encoding.hxx.in | |
| parent | eed0df951d95d48e7856107175a2baba212c3206 (diff) | |
| parent | 3af8c7715b359affce99c575bdcb84ca87585bb2 (diff) | |
| download | CMake-81870f1159a7b2649b027a6c3f75eba555831488.zip CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.gz CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
Diffstat (limited to 'Source/kwsys/Encoding.hxx.in')
| -rw-r--r-- | Source/kwsys/Encoding.hxx.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/kwsys/Encoding.hxx.in b/Source/kwsys/Encoding.hxx.in index 09691fd..b067521 100644 --- a/Source/kwsys/Encoding.hxx.in +++ b/Source/kwsys/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 |