Merge pull request #1 from rleigh-codelibre/outstanding-fixes
Apply outstanding fixes
diff --git a/Makefile.incl.in b/Makefile.incl.in
index 131681e..eaf5f5a 100644
--- a/Makefile.incl.in
+++ b/Makefile.incl.in
@@ -598,7 +598,7 @@
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind -seg1addr 0x38000000 -compatibility_version 1 -current_version $(LIB_MAJOR_DOT_VER) -install_name ${LINK_NAME} ${LDFLAGS}
LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS} ${LDFLAGS}
- export DYLD_LIBRARY_PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(DYLD_LIBRARY_PATH)
+ export DYLD_FALLBACK_LIBRARY_PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(DYLD_FALLBACK_LIBRARY_PATH)
LOC_LIB = ${LOC_LIBNAME}.${LIB_MAJOR_VER}.${LIB_MINOR_VER}$(SHLIBSUFFIX)
LOC_SONAME = ${LOC_LIBNAME}.${LIB_MAJOR_VER}${SHLIBSUFFIX}
MAKE_SHARED_LOC= ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind -seg1addr 0x40000000 -compatibility_version 1 -current_version $(LIB_MAJOR_DOT_VER) -install_name ${LOC_LIBNAME}${SHLIBSUFFIX} ${LDFLAGS}
diff --git a/Projects/Win32/Res/AllInOne/AllInOne.rc b/Projects/Win32/Res/AllInOne/AllInOne.rc
index 236de73..55a4c85 100644
--- a/Projects/Win32/Res/AllInOne/AllInOne.rc
+++ b/Projects/Win32/Res/AllInOne/AllInOne.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
+ "#include ""windows.h""\r\n"
"\r\n"
"\0"
END
diff --git a/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj b/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
index 2856f23..fdce3ac 100644
--- a/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
+++ b/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
@@ -159,7 +159,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\src\;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -197,7 +197,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\src\;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj b/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
index 96666d4..6aec170 100644
--- a/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
+++ b/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
@@ -159,6 +159,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -191,7 +192,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj b/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
index 57c8f72..9019729 100644
--- a/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
+++ b/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
@@ -144,7 +144,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
@@ -170,7 +170,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
diff --git a/README b/README
index 44a9195..7d58eee 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
Project Description:
The Apache Xalan C/C++ Project provides a library and a
- comand line program to transform XML documents using a
+ command line program to transform XML documents using a
stylesheet that conforms to XSLT 1.0 standards.
The source package contains all the code to create the library,
@@ -84,7 +84,7 @@
XalanMessages_1_11.exp - Windows DLL export definitions
XalanMessages_1_11.lib - Windows DLL library definitions
XalanMessages_1_11D.exp - Windows DLL export definitions
- XalanMessages_1_11D.lib - Windows DLL library defnitions
+ XalanMessages_1_11D.lib - Windows DLL library definitions
SUPPORTED PLATFORMS:
- This is only a partial list
diff --git a/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/src/xalanc/PlatformSupport/DOMStringHelper.cpp
index 4a69f5e..7124ad4 100644
--- a/src/xalanc/PlatformSupport/DOMStringHelper.cpp
+++ b/src/xalanc/PlatformSupport/DOMStringHelper.cpp
@@ -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 --git a/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
index 2e610d2..627d78c 100644
--- a/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
+++ b/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
@@ -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 --git a/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp b/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
index 2b14c99..ab34161 100644
--- a/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
+++ b/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
@@ -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,
