dbertoni 00/08/22 13:20:34
Modified: c/src/XMLSupport FormatterToDOM.cpp FormatterToDOM.hpp
FormatterToHTML.cpp FormatterToXML.cpp
FormatterToXML.hpp
Log:
Changes for AIX port.
Revision Changes Path
1.9 +3 -3 xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp
Index: FormatterToDOM.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterToDOM.cpp 2000/07/19 16:14:04 1.8
+++ FormatterToDOM.cpp 2000/08/22 20:20:29 1.9
@@ -158,7 +158,7 @@
append(elem);
- m_elemStack.push(m_currentElem);
+ m_elemStack.push_back(m_currentElem);
m_currentElem = elem;
}
@@ -171,9 +171,9 @@
{
if(m_elemStack.empty() == false)
{
- m_currentElem = m_elemStack.top();
+ m_currentElem = m_elemStack.back();
- m_elemStack.pop();
+ m_elemStack.pop_back();
}
else
{
1.9 +3 -3 xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp
Index: FormatterToDOM.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterToDOM.hpp 2000/07/19 16:14:05 1.8
+++ FormatterToDOM.hpp 2000/08/22 20:20:29 1.9
@@ -64,7 +64,7 @@
-#include <stack>
+#include <vector>
@@ -204,9 +204,9 @@
XalanElement* m_currentElem;
#if defined(XALAN_NO_NAMESPACES)
- typedef stack<XalanElement*> ElementStackType;
+ typedef vector<XalanElement*> ElementStackType;
#else
- typedef std::stack<XalanElement*> ElementStackType;
+ typedef std::vector<XalanElement*> ElementStackType;
#endif
ElementStackType m_elemStack;
1.22 +6 -6 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FormatterToHTML.cpp 2000/08/07 19:51:31 1.21
+++ FormatterToHTML.cpp 2000/08/22 20:20:30 1.22
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: FormatterToHTML.cpp,v 1.21 2000/08/07 19:51:31 dbertoni Exp $
+ * $Id: FormatterToHTML.cpp,v 1.22 2000/08/22 20:20:30 dbertoni Exp $
*
* $State: Exp $
*
@@ -202,7 +202,7 @@
FormatterToHTML::createElementFlagsMap();
-const FormatterToHTML::ElemDesc
FormatterToHTML::s_dummyDesc(ElemDesc::BLOCK);
+const FormatterToHTML::ElemDesc
FormatterToHTML::s_dummyDesc(FormatterToHTML::ElemDesc::BLOCK);
const XalanDOMCharVectorType FormatterToHTML::s_doctypeHeaderStartString =
@@ -402,7 +402,7 @@
m_inBlockElem = !isBlockElement;
- m_isRawStack.push(elemDesc.is(ElemDesc::RAW));
+ m_isRawStack.push_back(elemDesc.is(ElemDesc::RAW));
m_currentElementName = nameUpper;
@@ -436,7 +436,7 @@
const bool hasChildNodes = childNodesWereAdded();
- m_isRawStack.pop();
+ m_isRawStack.pop_back();
const XalanDOMString nameUpper = toUpperCase(name);
@@ -505,7 +505,7 @@
{
if (m_preserves.empty() == false)
{
- m_preserves.pop();
+ m_preserves.pop_back();
}
}
@@ -532,7 +532,7 @@
charactersRaw(chars, length);
}
else if (m_isRawStack.empty() == false &&
- m_isRawStack.top() == true)
+ m_isRawStack.back() == true)
{
writeParentTagEnd();
1.23 +9 -9 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FormatterToXML.cpp 2000/08/15 19:43:07 1.22
+++ FormatterToXML.cpp 2000/08/22 20:20:30 1.23
@@ -787,9 +787,9 @@
}
else
{
- m_ispreserve = m_preserves.top();
+ m_ispreserve = m_preserves.back();
- m_preserves.pop();
+ m_preserves.pop_back();
}
}
@@ -1197,15 +1197,15 @@
if(!m_elemStack.empty())
{
// See if the parent element has already been flagged as having
children.
- if(false == m_elemStack.top())
+ if(false == m_elemStack.back())
{
accum('>');
m_isprevtext = false;
- m_elemStack.pop();
- m_elemStack.push(true);
+ m_elemStack.pop_back();
+ m_elemStack.push_back(true);
- m_preserves.push(m_ispreserve);
+ m_preserves.push_back(m_ispreserve);
}
}
}
@@ -1215,7 +1215,7 @@
void
FormatterToXML::openElementForChildren()
{
- m_elemStack.push(false);
+ m_elemStack.push_back(false);
}
@@ -1227,9 +1227,9 @@
if (m_elemStack.size() > 0)
{
- fResult = m_elemStack.top();
+ fResult = m_elemStack.back();
- m_elemStack.pop();
+ m_elemStack.pop_back();
}
return fResult;
1.14 +6 -6 xml-xalan/c/src/XMLSupport/FormatterToXML.hpp
Index: FormatterToXML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FormatterToXML.hpp 2000/08/07 19:51:32 1.13
+++ FormatterToXML.hpp 2000/08/22 20:20:31 1.14
@@ -606,13 +606,13 @@
static const XalanDOMCharVectorType s_formatterToDOMString;
#if defined(XALAN_NO_NAMESPACES)
- typedef stack<bool>
BoolStackType;
- typedef vector<XalanDOMChar>
DOMCharBufferType;
- typedef vector<char>
ByteBufferType;
+ typedef vector<bool> BoolStackType;
+ typedef vector<XalanDOMChar> DOMCharBufferType;
+ typedef vector<char> ByteBufferType;
#else
- typedef std::stack<bool>
BoolStackType;
- typedef std::vector<XalanDOMChar>
DOMCharBufferType;
- typedef std::vector<char>
ByteBufferType;
+ typedef std::vector<bool> BoolStackType;
+ typedef std::vector<XalanDOMChar> DOMCharBufferType;
+ typedef std::vector<char> ByteBufferType;
#endif
/**
