This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e (commit)
via 5ddcaae77c531fc2e696204799505fbccb18b10d (commit)
via fe6725a1f7c055b920508e7179fbc21a38cd37d3 (commit)
from fde927d76b9d5fcb6721140cf14b6a56156d5c4c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e
commit 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e
Merge: fde927d76b 5ddcaae77c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 31 12:54:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 31 08:54:45 2019 -0400
Merge topic 'update-kwsys'
5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys
fe6725a1f7 KWSys 2019-10-30 (43131a7c)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3963
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ddcaae77c531fc2e696204799505fbccb18b10d
commit 5ddcaae77c531fc2e696204799505fbccb18b10d
Merge: 5b64788c51 fe6725a1f7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Oct 30 09:17:30 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 30 09:17:30 2019 -0400
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-10-30 (43131a7c)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe6725a1f7c055b920508e7179fbc21a38cd37d3
commit fe6725a1f7c055b920508e7179fbc21a38cd37d3
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Wed Oct 30 09:16:39 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 30 09:17:30 2019 -0400
KWSys 2019-10-30 (43131a7c)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 43131a7c283dd6f198a2318a25e546a97ac356b3 (master).
Upstream Shortlog
-----------------
Brad King (1):
cdd52ce1 RegularExpression: Initialize RegularExpressionMatch arrays
fully
Todd Martin (1):
569a1aed Encoding: Add ToWindowsExtendedPath support for wide string
diff --git a/Encoding.hxx.in b/Encoding.hxx.in
index b06752115c..75a2d4d0f9 100644
--- a/Encoding.hxx.in
+++ b/Encoding.hxx.in
@@ -68,6 +68,8 @@ public:
* absolute paths with Windows-style backslashes.
**/
static std::wstring ToWindowsExtendedPath(std::string const&);
+ static std::wstring ToWindowsExtendedPath(const char* source);
+ static std::wstring ToWindowsExtendedPath(std::wstring const& wsource);
# endif
#endif // @KWSYS_NAMESPACE@_STL_HAS_WSTRING
diff --git a/EncodingCXX.cxx b/EncodingCXX.cxx
index 4593c9251c..5cad934ec3 100644
--- a/EncodingCXX.cxx
+++ b/EncodingCXX.cxx
@@ -221,8 +221,18 @@ std::string Encoding::ToNarrow(const wchar_t* wcstr)
// Convert local paths to UNC style paths
std::wstring Encoding::ToWindowsExtendedPath(std::string const& source)
{
- std::wstring wsource = Encoding::ToWide(source);
+ return ToWindowsExtendedPath(ToWide(source));
+}
+// Convert local paths to UNC style paths
+std::wstring Encoding::ToWindowsExtendedPath(const char* source)
+{
+ return ToWindowsExtendedPath(ToWide(source));
+}
+
+// Convert local paths to UNC style paths
+std::wstring Encoding::ToWindowsExtendedPath(std::wstring const& wsource)
+{
// Resolve any relative paths
DWORD wfull_len;
@@ -269,7 +279,7 @@ std::wstring Encoding::ToWindowsExtendedPath(std::string
const& source)
// If this case has been reached, then the path is invalid. Leave it
// unchanged
- return Encoding::ToWide(source);
+ return wsource;
}
# endif
diff --git a/RegularExpression.hxx.in b/RegularExpression.hxx.in
index df7eb45589..0c2366b842 100644
--- a/RegularExpression.hxx.in
+++ b/RegularExpression.hxx.in
@@ -70,10 +70,10 @@ private:
* \brief Creates an invalid match object
*/
inline RegularExpressionMatch::RegularExpressionMatch()
+ : startp{}
+ , endp{}
+ , searchstring{}
{
- startp[0] = nullptr;
- endp[0] = nullptr;
- searchstring = nullptr;
}
/**
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/Encoding.hxx.in | 2 ++
Source/kwsys/EncodingCXX.cxx | 14 ++++++++++++--
Source/kwsys/RegularExpression.hxx.in | 6 +++---
3 files changed, 17 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
