mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 17:27:51 +08:00
6f2bc84506
* [xerces-c] Update to 3.2.2 * [xalan-c] Build against xerces-c 3.2.2 and include extra patches * [xalan-c] Use new vcpkg_extract_source_archive_ex() * [xerces-c] Use vcpkg_fixup_cmake_targets * [xerces-c] Disable vcpkg_test_cmake due to misbehavior in x64 * [xerces-c] Remove bin directory when building static * [xalan-c] Modernize
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
diff -urN a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
|
|
--- a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2012-03-19 16:18:10.000000000 +0000
|
|
+++ b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2018-09-07 16:08:39.207316486 +0100
|
|
@@ -84,7 +84,7 @@
|
|
const XalanDOMChar*
|
|
getName() const
|
|
{
|
|
- return name;
|
|
+ return const_cast<XalanDOMChar*>(reinterpret_cast<const XalanDOMChar*>(&name[0]));
|
|
}
|
|
|
|
/**
|
|
@@ -261,7 +261,7 @@
|
|
#pragma warning(disable: 4244)
|
|
theHandleType theSearchHandle =
|
|
_wfindfirst(
|
|
- const_cast<wchar_t*>(theConversionFunction(theFullSearchSpec)),
|
|
+ reinterpret_cast<wchar_t*>(const_cast<XalanDOMChar*>(theConversionFunction(theFullSearchSpec))),
|
|
&theFindData);
|
|
#pragma warning(pop)
|
|
|
|
diff -urN a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp
|
|
--- a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2012-03-19 16:18:10.000000000 +0000
|
|
+++ b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp 2018-09-07 16:08:39.207316486 +0100
|
|
@@ -868,7 +868,7 @@
|
|
const XalanDOMChar* theRHS)
|
|
{
|
|
#if defined(XALAN_USE_WINDOWS_COLLATION)
|
|
- return _wcscoll_l(theLHS, theRHS, s_locale);
|
|
+ return _wcscoll_l(reinterpret_cast<const wchar_t *>(theLHS), reinterpret_cast<const wchar_t *>(theRHS), s_locale);
|
|
#else
|
|
return doCollationCompare(
|
|
theLHS,
|
|
diff -urN a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
|
|
--- a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2012-03-19 16:18:10.000000000 +0000
|
|
+++ b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp 2018-09-07 16:08:39.207316486 +0100
|
|
@@ -123,7 +123,7 @@
|
|
|
|
#if defined(XALAN_WINDOWS)
|
|
HandleType theFileHandle = CreateFileW(
|
|
- theFileName.c_str(),
|
|
+ reinterpret_cast<const wchar_t *>(theFileName.c_str()),
|
|
GENERIC_WRITE,
|
|
0,
|
|
0,
|