aboutsummaryrefslogtreecommitdiff
path: root/ports/xalan-c/0003-char16_t.patch
blob: e8ed83bb0f602c0b473e244ff81b52d64866fb7c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
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,