dbertoni 00/08/07 12:51:36
Modified: c/src/XMLSupport FormatterToHTML.cpp FormatterToHTML.hpp
FormatterToXML.hpp
Log:
Fixes for AIX compiler issues.
Revision Changes Path
1.21 +35 -35 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FormatterToHTML.cpp 2000/08/04 21:29:08 1.20
+++ FormatterToHTML.cpp 2000/08/07 19:51:31 1.21
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: FormatterToHTML.cpp,v 1.20 2000/08/04 21:29:08 dbertoni Exp $
+ * $Id: FormatterToHTML.cpp,v 1.21 2000/08/07 19:51:31 dbertoni Exp $
*
* $State: Exp $
*
@@ -316,7 +316,7 @@
}
else
{
- return i->second;
+ return (*i).second;
}
}
@@ -986,7 +986,7 @@
XALAN_STATIC_UCODE_STRING("FRAME"),
ElemDesc(0|ElemDesc::EMPTY|ElemDesc::BLOCK)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1146,8 +1146,8 @@
XALAN_STATIC_UCODE_STRING("A"),
ElemDesc(0|ElemDesc::SPECIAL)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("HREF"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("NAME"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("HREF"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("NAME"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1170,9 +1170,9 @@
XALAN_STATIC_UCODE_STRING("IMG"),
ElemDesc(0|ElemDesc::SPECIAL|ElemDesc::ASPECIAL|ElemDesc::EMPTY|ElemDesc::WHITESPACESENSITIVE)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("LONGDESC"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("LONGDESC"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
theResult =
theElementFlags.insert(
@@ -1180,11 +1180,11 @@
XALAN_STATIC_UCODE_STRING("OBJECT"),
ElemDesc(0|ElemDesc::SPECIAL|ElemDesc::ASPECIAL|ElemDesc::HEADMISC|ElemDesc::WHITESPACESENSITIVE)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CLASSID"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CODEBASE"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DATA"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("ARCHIVE"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CLASSID"),
ElemDesc::ATTRURL);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CODEBASE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DATA"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("ARCHIVE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1242,7 +1242,7 @@
XALAN_STATIC_UCODE_STRING("Q"),
ElemDesc(0|ElemDesc::SPECIAL|ElemDesc::ASPECIAL)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
theResult =
theElementFlags.insert(
@@ -1250,7 +1250,7 @@
XALAN_STATIC_UCODE_STRING("BLOCKQUOTE"),
ElemDesc(0|ElemDesc::BLOCK|ElemDesc::BLOCKFORM|ElemDesc::BLOCKFORMFIELDSET)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
theResult =
theElementFlags.insert(
@@ -1258,7 +1258,7 @@
XALAN_STATIC_UCODE_STRING("INS"),
ElemDesc(0)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
theResult =
theElementFlags.insert(
@@ -1266,7 +1266,7 @@
XALAN_STATIC_UCODE_STRING("DEL"),
ElemDesc(0)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CITE"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1304,7 +1304,7 @@
XALAN_STATIC_UCODE_STRING("FORM"),
ElemDesc(0|ElemDesc::BLOCK)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("ACTION"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("ACTION"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1317,11 +1317,11 @@
XALAN_STATIC_UCODE_STRING("INPUT"),
ElemDesc(0|ElemDesc::FORMCTRL|ElemDesc::INLINELABEL|ElemDesc::EMPTY)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("CHECKED"),
ElemDesc::ATTREMPTY);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("USEMAP"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("CHECKED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
theResult =
theElementFlags.insert(
@@ -1329,8 +1329,8 @@
XALAN_STATIC_UCODE_STRING("SELECT"),
ElemDesc(0|ElemDesc::FORMCTRL|ElemDesc::INLINELABEL)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("MULTIPLE"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("MULTIPLE"),
ElemDesc::ATTREMPTY);
theResult =
theElementFlags.insert(
@@ -1338,7 +1338,7 @@
XALAN_STATIC_UCODE_STRING("OPTGROUP"),
ElemDesc(0)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
theResult =
theElementFlags.insert(
@@ -1346,8 +1346,8 @@
XALAN_STATIC_UCODE_STRING("OPTION"),
ElemDesc(0)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("SELECTED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("SELECTED"),
ElemDesc::ATTREMPTY);
theResult =
theElementFlags.insert(
@@ -1355,8 +1355,8 @@
XALAN_STATIC_UCODE_STRING("TEXTAREA"),
ElemDesc(0|ElemDesc::FORMCTRL|ElemDesc::INLINELABEL)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("READONLY"),
ElemDesc::ATTREMPTY);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1374,7 +1374,7 @@
XALAN_STATIC_UCODE_STRING("BUTTON"),
ElemDesc(0|ElemDesc::FORMCTRL|ElemDesc::INLINELABEL)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
+
(*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("DISABLED"),
ElemDesc::ATTREMPTY);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1432,7 +1432,7 @@
XALAN_STATIC_UCODE_STRING("HEAD"),
ElemDesc(0|ElemDesc::BLOCK)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("PROFILE"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("PROFILE"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1445,7 +1445,7 @@
XALAN_STATIC_UCODE_STRING("BASE"),
ElemDesc(0|ElemDesc::EMPTY|ElemDesc::BLOCK)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("HREF"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("HREF"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
@@ -1463,8 +1463,8 @@
XALAN_STATIC_UCODE_STRING("SCRIPT"),
ElemDesc(0|ElemDesc::SPECIAL|ElemDesc::ASPECIAL|ElemDesc::HEADMISC|ElemDesc::RAW)));
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
- theResult.first->second.setAttr(XALAN_STATIC_UCODE_STRING("FOR"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("SRC"),
ElemDesc::ATTRURL);
+ (*theResult.first).second.setAttr(XALAN_STATIC_UCODE_STRING("FOR"),
ElemDesc::ATTRURL);
theElementFlags.insert(
ElementFlagsMapType::value_type(
1.10 +6 -6 xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp
Index: FormatterToHTML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FormatterToHTML.hpp 2000/05/24 19:25:34 1.9
+++ FormatterToHTML.hpp 2000/08/07 19:51:31 1.10
@@ -58,7 +58,7 @@
#define FORMATTERTOHTML_HEADER_GUARD_1357924680
/**
- * $Id: FormatterToHTML.hpp,v 1.9 2000/05/24 19:25:34 dbertoni Exp $
+ * $Id: FormatterToHTML.hpp,v 1.10 2000/08/07 19:51:31 dbertoni Exp $
*
* $State: Exp $
*
@@ -246,16 +246,16 @@
}
else
{
- return i->second & flags ? true : false;
+ return (*i).second & flags ? true : false;
}
}
private:
#if defined(XALAN_NO_NAMESPACES)
- typedef map<DOMString, unsigned int> AttributeMapType;
+ typedef map<XalanDOMString, unsigned int, less<XalanDOMString>
> AttributeMapType;
#else
- typedef std::map<DOMString, unsigned int>
AttributeMapType;
+ typedef std::map<XalanDOMString, unsigned int>
AttributeMapType;
#endif
const unsigned int m_flags;
@@ -265,9 +265,9 @@
#if defined(XALAN_NO_NAMESPACES)
- typedef map<DOMString, ElemDesc> ElementFlagsMapType;
+ typedef map<XalanDOMString, ElemDesc, less<XalanDOMString> >
ElementFlagsMapType;
#else
- typedef std::map<DOMString, ElemDesc> ElementFlagsMapType;
+ typedef std::map<XalanDOMString, ElemDesc> ElementFlagsMapType;
#endif
static const ElementFlagsMapType s_elementFlags;
1.13 +0 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FormatterToXML.hpp 2000/05/24 19:26:12 1.12
+++ FormatterToXML.hpp 2000/08/07 19:51:32 1.13
@@ -606,14 +606,10 @@
static const XalanDOMCharVectorType s_formatterToDOMString;
#if defined(XALAN_NO_NAMESPACES)
-// typedef map<XalanDOMString, XalanDOMString>
DOMStringMapType;
-// typedef map<XalanDOMString, int>
DOMString2IntMapType;
typedef stack<bool>
BoolStackType;
typedef vector<XalanDOMChar>
DOMCharBufferType;
typedef vector<char>
ByteBufferType;
#else
-// typedef std::map<XalanDOMString, XalanDOMString>
DOMStringMapType;
-// typedef std::map<XalanDOMString, int>
DOMString2IntMapType;
typedef std::stack<bool>
BoolStackType;
typedef std::vector<XalanDOMChar>
DOMCharBufferType;
typedef std::vector<char>
ByteBufferType;
