jdonohue 00/02/03 12:13:28
Modified: c/src Makefile.in configure
c/src/Include PlatformDefinitions.hpp
c/src/PlatformSupport DOMStringHelper.hpp
c/src/TestXSLT process.cpp
c/src/XMLSupport FormatterToHTML.cpp FormatterToXML.cpp
XMLParserLiaisonDefault.cpp
c/src/XPath XNodeSet.cpp XObjectFactoryDefault.cpp XPath.cpp
c/src/XSLT ElemApplyTemplates.cpp ElemLiteralResult.cpp
ElemNumber.cpp ElemNumber.hpp StylesheetHandler.cpp
StylesheetRoot.cpp XSLProcessorException.hpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
c/src/XercesInit XercesInit.cpp
c/src/XercesPlatformSupport TextFileOutputStream.cpp
XercesStdTextOutputStream.cpp
XercesTextOutputStream.cpp
Log:
Linux changes
Revision Changes Path
1.2 +5 -2 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2000/01/27 20:30:27 1.1
+++ Makefile.in 2000/02/03 20:13:12 1.2
@@ -55,6 +55,13 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.2 2000/02/03 20:13:12 jdonohue
+# Linux changes
+# PR:
+# Obtained from:
+# Submitted by:
+# Reviewed by:
+#
# Revision 1.1 2000/01/27 20:30:27 jdonohue
# no message
#
@@ -112,8 +119,8 @@
endif
# We need the Xerces library
-ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_0
-XERCESLIB = $(XERCESCROOT)/lib/libxerces-c1_0.so
+ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_1
+XERCESLIB = $(XERCESCROOT)/lib/libxerces-c1_1.so
XSL_BUILD_OPTIONS =
1.2 +3 -3 xml-xalan/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 2000/01/28 14:22:16 1.1
+++ configure 2000/02/03 20:13:12 1.2
@@ -451,7 +451,7 @@
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Include/PlatformDefinitions.hpp
+ac_unique_file=PlatformSupport/PlatformSupportDefinitions.hpp
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
@@ -1458,7 +1458,7 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -1555,7 +1555,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
1.3 +4 -1 xml-xalan/c/src/Include/PlatformDefinitions.hpp
Index: PlatformDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/PlatformDefinitions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlatformDefinitions.hpp 2000/01/28 15:00:26 1.2
+++ PlatformDefinitions.hpp 2000/02/03 20:13:13 1.3
@@ -57,8 +57,10 @@
#if !defined(PLATFORMDEFINITIONS_HEADER_GUARD_1357924680)
#define PLATFORMDEFINITIONS_HEADER_GUARD_1357924680
+#if defined(_DEBUG)
+#define XML_DEBUG
+#endif
-
#if defined(_MSC_VER)
# include "VCPPDefinitions.hpp"
#else
@@ -71,6 +73,7 @@
# define XALAN_OLD_AUTO_PTR
# define XALAN_NO_COVARIANT_RETURN_TYPE
# define XALAN_XTREE_BUG
+# define XALAN_WIDE_STRING_UCODE_PROBLEM
//# define XALAN_NEED_SPECIAL_NAN_SUPPORT
//# define XALAN_HASH_CONTAINERS_AVAILABLE
# else
1.5 +7 -0 xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMStringHelper.hpp 2000/01/28 14:59:21 1.4
+++ DOMStringHelper.hpp 2000/02/03 20:13:15 1.5
@@ -70,6 +70,7 @@
#include <functional>
#include <iosfwd>
#include <vector>
+#include <string>
@@ -633,12 +634,18 @@
DOMStringToStdString(const DOMString& domString);
+#if defined(__GNUC__)
+
+// Linux GNU C++ doesn't support wstring
+#else
inline std::wstring
DOMStringToStdWString(const DOMString& domString)
{
return (c_wstr(domString));
}
+
+#endif
1.4 +10 -7 xml-xalan/c/src/TestXSLT/process.cpp
Index: process.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/TestXSLT/process.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- process.cpp 2000/01/26 20:35:15 1.3
+++ process.cpp 2000/02/03 20:13:16 1.4
@@ -132,14 +132,15 @@
writer.println(" [-PARAM name expression (Set a stylesheet
parameter)]");
}
+/*
void printChildren(const DOM_Node& theNode, int level=0)
{
XMLCh *nodeTypeNames[] =
{
- L"", L"ELEMENT_NODE", L"ATTRIBUTE_NODE", L"TEXT_NODE",
L"CDATA_SECTION_NODE",
- L"ENTITY_REFERENCE_NODE", L"ENTITY_NODE",
L"PROCESSING_INSTRUCTION_NODE",
- L"COMMENT_NODE", L"DOCUMENT_NODE", L"DOCUMENT_TYPE_NODE",
- L"DOCUMENT_FRAGMENT_NODE", L"NOTATION_NODE",
+ "", "ELEMENT_NODE", "ATTRIBUTE_NODE", "TEXT_NODE",
"CDATA_SECTION_NODE",
+ "ENTITY_REFERENCE_NODE", "ENTITY_NODE",
"PROCESSING_INSTRUCTION_NODE",
+ "COMMENT_NODE", "DOCUMENT_NODE", "DOCUMENT_TYPE_NODE",
+ "DOCUMENT_FRAGMENT_NODE", "NOTATION_NODE",
};
DOM_NodeList nl = theNode.getChildNodes();
@@ -151,15 +152,16 @@
printf("%d.%d: ", level, i);
const DOM_Node n = nl.item(i);
std::basic_string<XMLCh> s(c_wstr(n.getNodeName()));
- s.append(L"(");
+ s.append("(");
int t = n.getNodeType();
s.append(nodeTypeNames[t]);
- s.append(L")");
+ s.append(")");
printf("%-20ws ", s.c_str());
printf( t==3 ? "= %ws\n": "\n", c_wstr(n.getNodeValue()));
printChildren(n, level);
}
}
+*/
void xsltMain(int argc, const char* argv[] ) throw(XMLException)
@@ -399,10 +401,11 @@
/*
* Output the source tree
*/
+/*
if (0)
if (! setQuietMode)
printChildren(sourceTree);
-
+ */
if(0 != stylesheet)
{
1.4 +1 -4 xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormatterToHTML.cpp 2000/01/28 14:52:00 1.3
+++ FormatterToHTML.cpp 2000/02/03 20:13:17 1.4
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: FormatterToHTML.cpp,v 1.3 2000/01/28 14:52:00 jdonohue Exp $
+ * $Id: FormatterToHTML.cpp,v 1.4 2000/02/03 20:13:17 jdonohue Exp $
*
* $State: Exp $
*
@@ -308,9 +308,6 @@
const unsigned int length)
{
if(0 == length) return;
-
- std::basic_string<XMLCh> msg(L"Invalid UTF-16 surrogate detected: ");
- XMLCh buffer[32]; // Should be big enough
if(m_nextIsRaw)
{
1.6 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToXML.cpp
Index: FormatterToXML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormatterToXML.cpp 2000/01/28 14:52:00 1.5
+++ FormatterToXML.cpp 2000/02/03 20:13:17 1.6
@@ -960,7 +960,7 @@
* Method consumes two characters from the input buffer
*/
{
- DOMString msg(L"Invalid UTF-16 surrogate detected: ");
+ DOMString msg("Invalid UTF-16 surrogate detected: ");
// UTF-16 surrogate
int next;
int ch = chars[i];
1.4 +1 -0 xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.cpp
Index: XMLParserLiaisonDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLParserLiaisonDefault.cpp 2000/01/28 14:52:00 1.3
+++ XMLParserLiaisonDefault.cpp 2000/02/03 20:13:17 1.4
@@ -62,6 +62,7 @@
// Standard header files
#include <cassert>
#include <cstring>
+#include <memory>
1.2 +0 -2 xml-xalan/c/src/XPath/XNodeSet.cpp
Index: XNodeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSet.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNodeSet.cpp 1999/12/18 19:47:55 1.1
+++ XNodeSet.cpp 2000/02/03 20:13:18 1.2
@@ -59,8 +59,6 @@
-#include <limits>
-
#include <PlatformSupport/DOMStringHelper.hpp>
1.4 +1 -1 xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp
Index: XObjectFactoryDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObjectFactoryDefault.cpp 2000/01/26 20:34:29 1.3
+++ XObjectFactoryDefault.cpp 2000/02/03 20:13:18 1.4
@@ -111,7 +111,7 @@
#if defined(XALAN_HASH_CONTAINERS_AVAILABLE)
return theCollection.erase(theObject) > 0 ? true : false;
#else
- CollectionType::iterator i =
+ typename CollectionType::iterator i =
std::find(theCollection.begin(),
theCollection.end(),
theObject);
1.5 +3 -3 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPath.cpp 2000/01/28 14:50:46 1.4
+++ XPath.cpp 2000/02/03 20:13:19 1.5
@@ -1183,13 +1183,13 @@
}
catch(...)
{
- executionContext.error(DOMString(L"Could not get variable named
") + varName->str());
+ executionContext.error(DOMString("Could not get variable named
") + varName->str());
}
if(0 == result)
{
- executionContext.warn(DOMString(L"VariableReference given for
variable out ") +
- DOMString(L"of
context or without definition! Name = ") +
+ executionContext.warn(DOMString("VariableReference given for
variable out ") +
+ DOMString("of
context or without definition! Name = ") +
varName->str(),
context);
}
1.3 +1 -1 xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemApplyTemplates.cpp 2000/01/26 14:26:56 1.2
+++ ElemApplyTemplates.cpp 2000/02/03 20:13:20 1.3
@@ -62,7 +62,7 @@
-#include <include/DOMHelper.hpp>
+#include <Include/DOMHelper.hpp>
1.3 +1 -1 xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemLiteralResult.cpp 2000/01/26 14:26:57 1.2
+++ ElemLiteralResult.cpp 2000/02/03 20:13:21 1.3
@@ -201,7 +201,7 @@
// so we have to iterate from there down
for (int i = nsVector->size()-1; i>=0; i--)
{
- ns = nsVector->at(i);
+ ns = (*nsVector)[i];
if(!isEmpty(ns.getURI()) && ns.getResultCandidate())
{
1.4 +8 -1 xml-xalan/c/src/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemNumber.cpp 2000/01/26 20:32:44 1.3
+++ ElemNumber.cpp 2000/02/03 20:13:21 1.4
@@ -651,6 +651,8 @@
+#if ! defined(__GNUC__)
+
std::locale
ElemNumber::getLocale(
StylesheetExecutionContext& /*
executionContext */,
@@ -660,6 +662,7 @@
return std::locale();
}
+#endif
NumberFormat*
@@ -667,7 +670,9 @@
StylesheetExecutionContext&
executionContext,
const DOM_Node&
contextNode) const
{
+#if ! defined(__GNUC__)
std::locale loc = getLocale(executionContext, contextNode);
+#endif
// Helper to format local specific numbers to strings.
std::auto_ptr<NumberFormat> formatter(new NumberFormat);
@@ -725,7 +730,9 @@
NumeratorFormatter::NumberFormatStringTokenizer
formatTokenizer(formatValue);
+#if ! defined(__GNUC__)
std::locale loc = getLocale(executionContext, contextNode);
+#endif
for(int i = 0; i < nNumbers; i++)
{
@@ -877,7 +884,7 @@
// logs of the radix. For now, we fake it.
const int buflen = 100;
- std::vector<XMLCh> buf(buflen + 1, 0);
+ std::vector<XMLCh> buf(buflen + 1, (XMLCh)0);
// next character to set in the buffer
int charPos = buflen - 1 ; // work backward through buf[]
1.3 +6 -2 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemNumber.hpp 2000/01/26 14:26:58 1.2
+++ ElemNumber.hpp 2000/02/03 20:13:21 1.3
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.2 2000/01/26 14:26:58 dbertoni Exp $
+ * $Id: ElemNumber.hpp,v 1.3 2000/02/03 20:13:21 jdonohue Exp $
*
* $State: Exp $
*
@@ -72,8 +72,10 @@
#include "ElemTemplateElement.hpp"
-
+// Just locale.h in G++
+#if ! defined(__GNUC__)
#include <locale>
+#endif
@@ -261,6 +263,7 @@
const XPath*
countMatchPattern,
const DOM_Node& node)
const;
+#if ! defined(__GNUC__)
/**
* Get the locale we should be using.
*/
@@ -268,6 +271,7 @@
getLocale(
StylesheetExecutionContext&
executionContext,
const DOM_Node&
contextNode) const;
+#endif
NumberFormat*
getNumberFormatter(
1.5 +1 -1 xml-xalan/c/src/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StylesheetHandler.cpp 2000/01/26 20:32:03 1.4
+++ StylesheetHandler.cpp 2000/02/03 20:13:21 1.5
@@ -59,7 +59,7 @@
#include <sax/Locator.hpp>
-#include <sax/SaxException.hpp>
+#include <sax/SAXException.hpp>
#include <util/XMLURL.hpp>
1.4 +3 -3 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StylesheetRoot.cpp 2000/01/26 14:29:12 1.3
+++ StylesheetRoot.cpp 2000/02/03 20:13:21 1.4
@@ -85,7 +85,7 @@
#include <XMLSupport/FormatterToDOM.hpp>
#include <PlatformSupport/StringTokenizer.hpp>
-#include <PlatformSupport/AttributeListimpl.hpp>
+#include <PlatformSupport/AttributeListImpl.hpp>
#include <XercesPlatformSupport/XercesDOMPrintWriter.hpp>
#include <XercesPlatformSupport/XercesStdTextOutputStream.hpp>
@@ -663,7 +663,7 @@
int nListeners = m_traceListeners.size();
for(int i = 0; i < nListeners; i++)
{
- TraceListener* tl = m_traceListeners.at(i);
+ TraceListener* tl = m_traceListeners[i];
tl->trace(te);
}
}
@@ -676,7 +676,7 @@
int nListeners = m_traceListeners.size();
for(int i = 0; i < nListeners; i++)
{
- TraceListener* tl = m_traceListeners.at(i);
+ TraceListener* tl = m_traceListeners[i];
tl->selected(se);
}
}
1.3 +1 -1 xml-xalan/c/src/XSLT/XSLProcessorException.hpp
Index: XSLProcessorException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLProcessorException.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLProcessorException.hpp 2000/01/28 14:33:25 1.2
+++ XSLProcessorException.hpp 2000/02/03 20:13:21 1.3
@@ -60,7 +60,7 @@
// Base header file. Must be first.
-#include <xSLT/XSLTDefinitions.hpp>
+#include <XSLT/XSLTDefinitions.hpp>
#include <dom/DOMString.hpp>
#include <dom/DOM_Node.hpp>
1.7 +22 -21 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTEngineImpl.cpp 2000/01/28 14:37:29 1.6
+++ XSLTEngineImpl.cpp 2000/02/03 20:13:22 1.7
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: XSLTEngineImpl.cpp,v 1.6 2000/01/28 14:37:29 jdonohue Exp $
+ * $Id: XSLTEngineImpl.cpp,v 1.7 2000/02/03 20:13:22 jdonohue Exp $
*
* $State: Exp $
*
@@ -131,7 +131,7 @@
#include <dom/DOM_ProcessingInstruction.hpp>
#include <sax/DocumentHandler.hpp>
#include <sax/Locator.hpp>
-#include <sax/SaxException.hpp>
+#include <sax/SAXException.hpp>
#include <util/PlatformUtils.hpp>
#include <framework/URLInputSource.hpp>
@@ -568,8 +568,9 @@
{
delete m_stylesheetRoot;
+ DOMString ds("Input XSL");
const DOMString xslIdentifier(0 == stylesheetSource.getSystemId() ?
-
L"Input XSL" : stylesheetSource.getSystemId());
+ ds :
stylesheetSource.getSystemId());
// In case we have a fragment identifier, go ahead and
// try to parse the XML here.
@@ -731,7 +732,7 @@
if(fragIndex == 0)
{
- diag(L"Locating stylesheet from fragment identifier...");
+ diag("Locating stylesheet from fragment identifier...");
const DOMString fragID = substring(localXSLURLString,
1);
@@ -754,15 +755,15 @@
if (node.getNodeType() == DOM_Node::ELEMENT_NODE)
nsNode = (static_cast<const
DOM_Element&>(node));
else
- error(L"Could not identify fragment: " +
fragID);
+ error("Could not identify fragment: " + fragID);
}
// Try a bunch of really ugly stuff to find the fragment.
// What's the right way to do this?
- DOMString ds(L"id(");
+ DOMString ds("id(");
ds += fragID;
- ds += L")";
+ ds += ")";
ElementPrefixResolverProxy theProxy(nsNode,
m_xpathSupport);
@@ -779,9 +780,9 @@
if(nl->getLength() == 0)
{
- ds = L"//[EMAIL PROTECTED]'";
+ ds = "//[EMAIL PROTECTED]'";
ds += fragID;
- ds += L"']";
+ ds += "']";
theExecutionContext.setContextNodeList(NodeRefList());
@@ -791,9 +792,9 @@
if(nl->getLength() == 0)
{
- ds = L"//[EMAIL PROTECTED]'";
+ ds = "//[EMAIL PROTECTED]'";
ds += fragID;
- ds += L"']";
+ ds += "']";
theExecutionContext.setContextNodeList(NodeRefList());
@@ -815,7 +816,7 @@
if(nl->getLength() == 0)
{
- error(L"Could not find fragment: " + fragID);
+ error("Could not find fragment: " + fragID);
}
DOM_Node frag = nl->item(0);
@@ -839,19 +840,19 @@
FormatterTreeWalker tw(flistener);
tw.traverse(frag);
- displayDuration(L"Setup of " + localXSLURLString,
&frag);
+ displayDuration("Setup of " + localXSLURLString, &frag);
}
else
{
stylesheetDoc = 0;
- error(L"Node pointed to by fragment identifier was not
an element: " + fragID);
+ error("Node pointed to by fragment identifier was not
an element: " + fragID);
}
}
else
{
// hmmm.. for now I'll rely on the XML parser to handle
// fragment URLs.
- diag(L"========= Parsing and preparing " + localXSLURLString +
L" ==========");
+ diag("========= Parsing and preparing " + localXSLURLString + "
==========");
pushTime(&localXSLURLString);
if(isRoot)
@@ -2775,8 +2776,8 @@
// TODO: Find out about empty attribute template expression handling.
if(0 != length(stringedValue))
{
- if((equals(attrName, L"xmlns") || startsWith(attrName,
L"xmlns:"))
- && startsWith(stringedValue, L"quote:"))
+ if((equals(attrName, "xmlns") || startsWith(attrName, "xmlns:"))
+ && startsWith(stringedValue, "quote:"))
{
stringedValue = substring(stringedValue, 6);
}
@@ -3066,21 +3067,21 @@
{
const DOM_Element& parentElem =
static_cast<const DOM_Element&>(parent);
- const DOM_Attr attr =
parentElem.getAttributeNode(L"xml:space");
+ const DOM_Attr attr =
parentElem.getAttributeNode("xml:space");
if(0 != attr)
{
const DOMString xmlSpaceVal =
attr.getValue();
- if(equals(xmlSpaceVal, L"preserve"))
+ if(equals(xmlSpaceVal, "preserve"))
{
strip = false;
}
- else if(equals(xmlSpaceVal, L"default"))
+ else if(equals(xmlSpaceVal, "default"))
{
strip = true;
}
else
{
- error(L"xml:space in the source
XML has an illegal value: " + xmlSpaceVal);
+ error("xml:space in the source
XML has an illegal value: " + xmlSpaceVal);
}
break;
}
1.5 +5 -1 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTEngineImpl.hpp 2000/01/26 20:32:44 1.4
+++ XSLTEngineImpl.hpp 2000/02/03 20:13:23 1.5
@@ -59,7 +59,7 @@
/**
*
- * $Id: XSLTEngineImpl.hpp,v 1.4 2000/01/26 20:32:44 dbertoni Exp $
+ * $Id: XSLTEngineImpl.hpp,v 1.5 2000/02/03 20:13:23 jdonohue Exp $
*
* $State: Exp $
*
@@ -136,6 +136,10 @@
#endif
#include <map>
#include <set>
+
+#if defined(__GNUC__)
+#include <stdexcept>
+#endif
1.2 +4 -1 xml-xalan/c/src/XercesInit/XercesInit.cpp
Index: XercesInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesInit/XercesInit.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesInit.cpp 1999/12/18 19:48:14 1.1
+++ XercesInit.cpp 2000/02/03 20:13:25 1.2
@@ -93,6 +93,9 @@
#else
-#error Unsupported platform!!!
+# if defined(LINUX)
+# else
+# error Unsupported platform!!!
+# endif
#endif
1.7 +3 -0
xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.cpp
Index: TextFileOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TextFileOutputStream.cpp 2000/01/31 17:45:02 1.6
+++ TextFileOutputStream.cpp 2000/02/03 20:13:27 1.7
@@ -67,6 +67,9 @@
#include "windows.h"
#else
#define INVALID_HANDLE_VALUE 0
+
+#include <cerrno>
+
#endif
1.3 +7 -5
xml-xalan/c/src/XercesPlatformSupport/XercesStdTextOutputStream.cpp
Index: XercesStdTextOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesPlatformSupport/XercesStdTextOutputStream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesStdTextOutputStream.cpp 2000/01/26 20:30:56 1.2
+++ XercesStdTextOutputStream.cpp 2000/02/03 20:13:27 1.3
@@ -58,9 +58,11 @@
#include "XercesStdTextOutputStream.hpp"
+#include <strstream>
-#include <ostream>
-#include <sstream>
+#if defined(__GNUC__)
+#include <cerrno>
+#endif
@@ -116,13 +118,13 @@
{
DOMString theResult(clone(theMessage));
- std::stringstream theFormatter;
+ std::ostrstream theFormatter;
theFormatter << ". The error code was "
<< theErrorCode
- << ".";
+ << "." << '\0';
- theResult += theFormatter.str().c_str();
+ theResult += theFormatter.str();
return theResult;
}
1.2 +0 -2
xml-xalan/c/src/XercesPlatformSupport/XercesTextOutputStream.cpp
Index: XercesTextOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesPlatformSupport/XercesTextOutputStream.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextOutputStream.cpp 2000/01/25 22:18:18 1.1
+++ XercesTextOutputStream.cpp 2000/02/03 20:13:27 1.2
@@ -59,8 +59,6 @@
-#include <sstream>
-
#if defined(_MSC_VER)
