You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/09/02 08:16:53 UTC
svn commit: r691115 - in /xalan/c/trunk: Projects/Win32/VC6/AllInOne/
src/xalanc/PlatformSupport/ src/xalanc/XPath/ src/xalanc/XSLT/
src/xalanc/XercesParserLiaison/
Author: dbertoni
Date: Mon Sep 1 23:16:53 2008
New Revision: 691115
URL: http://svn.apache.org/viewvc?rev=691115&view=rev
Log:
Visual C++ 6.0 fixes.
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp
xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp Mon Sep 1 23:16:53 2008
@@ -558,6 +558,14 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Mon Sep 1 23:16:53 2008
@@ -528,6 +528,14 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Mon Sep 1 23:16:53 2008
@@ -849,7 +849,7 @@
-#if defined(XALAN_WINDOWS)
+#if defined(XALAN_USE_WINDOWS_COLLATION)
static _locale_t s_locale;
#endif
@@ -858,7 +858,7 @@
const XalanDOMChar* theLHS,
const XalanDOMChar* theRHS)
{
-#if defined(XALAN_WINDOWS)
+#if defined(XALAN_USE_WINDOWS_COLLATION)
return _wcscoll_l(theLHS, theRHS, s_locale);
#else
return doCollationCompare(
@@ -1895,7 +1895,7 @@
void
DOMStringHelper::initialize(MemoryManager& /* theMemoryManager */)
{
-#if defined(XALAN_WINDOWS)
+#if defined(XALAN_USE_WINDOWS_COLLATION)
s_locale = _create_locale(LC_COLLATE, "");
#endif
}
@@ -1905,7 +1905,7 @@
void
DOMStringHelper::terminate()
{
-#if defined(XALAN_WINDOWS)
+#if defined(XALAN_USE_WINDOWS_COLLATION)
_free_locale(s_locale);
#endif
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp Mon Sep 1 23:16:53 2008
@@ -197,7 +197,7 @@
XalanDestroy(
*m_memoryManager,
- theFunction);
+ *theFunction);
return true;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp Mon Sep 1 23:16:53 2008
@@ -98,6 +98,40 @@
static void
defaultFormat(
+ PrintWriter& pw,
+ eSource source,
+ eClassification classification,
+ const XalanDOMString& msg,
+ const Locator* locator,
+ const XalanNode* sourceNode)
+ {
+ ProblemListenerBase::defaultFormat(
+ pw,
+ source,
+ classification,
+ msg,
+ locator,
+ sourceNode);
+ }
+
+ static void
+ defaultFormat(
+ PrintWriter& pw,
+ eSource source,
+ eClassification classification,
+ const XalanDOMString& msg,
+ const XalanNode* sourceNode)
+ {
+ ProblemListenerBase::defaultFormat(
+ pw,
+ source,
+ classification,
+ msg,
+ sourceNode);
+ }
+
+ static void
+ defaultFormat(
PrintWriter& pw,
eSource source,
eClassification classification,
@@ -108,10 +142,6 @@
XalanFileLoc lineNo,
XalanFileLoc charOffset);
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ProblemListenerBase::defaultFormat;
-#endif
-
private:
MemoryManager& m_memoryManager;
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp?rev=691115&r1=691114&r2=691115&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp Mon Sep 1 23:16:53 2008
@@ -184,11 +184,12 @@
const DOMNodeType*
XercesDocumentWrapper::mapNode(XalanNode* theXalanNode) const
{
- if (this == theXalanNode)
+ if (static_cast<const XalanNode*>(this) == theXalanNode)
{
return m_xercesDocument;
}
- else if (theXalanNode == 0 || this != theXalanNode->getOwnerDocument())
+ else if (theXalanNode == 0 ||
+ static_cast<const XalanNode*>(this) != theXalanNode->getOwnerDocument())
{
throw XercesDOMWrapperException(XercesDOMWrapperException::WRONG_DOCUMENT_ERR);
}
@@ -812,7 +813,7 @@
// Delete the node...
XalanDestroy(
m_nodes.getMemoryManager(),
- *i);
+ **i);
// Erase it from the map...
m_nodes.erase(i);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org