dbertoni 2004/08/05 16:38:38
Modified: c/src/xalanc/XalanDOM XalanDOMString.cpp XalanDOMString.hpp
Log:
Cleaned up some old code and fixed interfaces.
Revision Changes Path
1.10 +4 -24 xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp
Index: XalanDOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanDOMString.cpp 31 Jul 2004 06:05:10 -0000 1.9
+++ XalanDOMString.cpp 5 Aug 2004 23:38:38 -0000 1.10
@@ -247,29 +247,11 @@
XalanDOMString&
XalanDOMString::assign(
- const_iterator theFirstPosition,
- const_iterator theLastPosition)
+ iterator theFirstPosition,
+ iterator theLastPosition)
{
invariants();
-#if defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x400
- XalanDOMString temp;
-
- temp.m_data.reserve(theLastPosition - theFirstPosition + 1);
-
- while(theFirstPosition != theLastPosition)
- {
- temp.m_data.push_back(*theFirstPosition);
-
- ++theFirstPosition;
- }
-
- temp.m_data.push_back(XalanDOMChar(0));
-
- temp.m_size = temp.m_data.size() - 1;
-
- swap(temp);
-#else
m_data.reserve(theLastPosition - theFirstPosition + 1);
m_data.assign(theFirstPosition, theLastPosition);
@@ -279,8 +261,6 @@
m_size = size_type(m_data.size()) - 1;
assert(m_data.size() - 1 == m_size);
-#endif
-
invariants();
return *this;
@@ -536,8 +516,8 @@
void
XalanDOMString::insert(
iterator theInsertPosition,
- const_iterator theFirstPosition,
- const_iterator theLastPosition)
+ iterator theFirstPosition,
+ iterator theLastPosition)
{
invariants();
1.8 +4 -9 xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.hpp
Index: XalanDOMString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanDOMString.hpp 31 Jul 2004 06:05:10 -0000 1.7
+++ XalanDOMString.hpp 5 Aug 2004 23:38:38 -0000 1.8
@@ -62,7 +62,6 @@
enum { npos = -1 };
#endif
- explicit
XalanDOMString();
explicit
@@ -284,9 +283,6 @@
return m_data[theIndex];
}
-#if 0
- // $$$ ToDo: at() is not supported in the current version of GCC's
vector<>
- // implementation. Eventually, it should be.
const_reference
at(size_type theIndex) const
{
@@ -302,7 +298,6 @@
return m_data.at(theIndex);
}
-#endif
const XalanDOMChar*
c_str() const
@@ -445,8 +440,8 @@
XalanDOMString&
assign(
- const_iterator theFirstPosition,
- const_iterator theLastPosition);
+ iterator theFirstPosition,
+ iterator theLastPosition);
XalanDOMString&
append(const XalanDOMString& theSource)
@@ -555,8 +550,8 @@
void
insert(
iterator theInsertPosition,
- const_iterator theFirstPosition,
- const_iterator theLastPosition);
+ iterator theFirstPosition,
+ iterator theLastPosition);
XalanDOMString
substr(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
