dbertoni 00/04/11 13:05:08
Modified: c/src/XSLT ElemNumber.cpp Stylesheet.cpp XSLTEngineImpl.cpp
Log:
Fixed Linux build problems.
Revision Changes Path
1.8 +5 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemNumber.cpp 2000/04/11 15:09:25 1.7
+++ ElemNumber.cpp 2000/04/11 20:05:07 1.8
@@ -859,14 +859,15 @@
int val,
const XalanDOMString& table)
{
- const int radix = length(table);
+ const int radix = length(table);
// Create a buffer to hold the result
// TODO: size of the table can be determined by computing
// logs of the radix. For now, we fake it.
- const int buflen = 100;
+ const int buflen = 100;
- vector<XalanDOMChar> buf(buflen + 1, 0);
+ XalanDOMChar buf[buflen + 1];
+ memset(buf, 0, buflen + 1);
// next character to set in the buffer
int charPos = buflen - 1 ; // work backward through buf[]
@@ -926,7 +927,7 @@
}
while (val > 0);
- XalanDOMString retStr(buf.begin() + charPos + 1, (buflen - charPos -
1));
+ XalanDOMString retStr(buf + charPos + 1, (buflen - charPos - 1));
return retStr;
}
1.10 +1 -1 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Stylesheet.cpp 2000/04/11 15:09:28 1.9
+++ Stylesheet.cpp 2000/04/11 20:05:07 1.10
@@ -438,7 +438,7 @@
if(0 != xp)
{
- using XPath::TargetElementStringsVectorType;
+ typedef XPath::TargetElementStringsVectorType
TargetElementStringsVectorType;
TargetElementStringsVectorType strings;
1.21 +1 -13 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSLTEngineImpl.cpp 2000/04/11 15:09:30 1.20
+++ XSLTEngineImpl.cpp 2000/04/11 20:05:07 1.21
@@ -380,7 +380,7 @@
XalanDOMString stylesheetURI = 0;
XalanNode* child =
sourceTree->getFirstChild();
-#if !defined(XALAN_NO_NAMESPACES
+#if !defined(XALAN_NO_NAMESPACES)
using std::vector;
#endif
@@ -2152,11 +2152,7 @@
bool
XSLTEngineImpl::isCDataResultElem(const XalanDOMString& elementName)
{
-#if defined(XALAN_NO_NAMESPACES)
typedef Stylesheet::QNameVectorType QNameVectorType;
-#else
- using Stylesheet::QNameVectorType;
-#endif
bool is = false;
const QNameVectorType& cdataElems =
m_stylesheetRoot->getCdataSectionElems();
@@ -3050,11 +3046,7 @@
{
// $$$ ToDo: All of this should be
moved into a member of
// Stylesheet, so as not to expose
these two data members...
-#if defined(XALAN_NO_NAMESPACES)
typedef Stylesheet::XPathVectorType
XPathVectorType;
-#else
- using Stylesheet::XPathVectorType;
-#endif
const XPathVectorType& theElements =
m_stylesheetRoot->getWhitespacePreservingElements();
@@ -3082,11 +3074,7 @@
}
{
-#if defined(XALAN_NO_NAMESPACES)
typedef Stylesheet::XPathVectorType
XPathVectorType;
-#else
- using Stylesheet::XPathVectorType;
-#endif
const XPathVectorType& theElements =
m_stylesheetRoot->getWhitespaceStrippingElements();
