dbertoni 01/02/08 13:41:08
Modified: c/src/XalanDOM XalanDOMString.cpp XalanDOMString.hpp
Log:
Removed support for using std::string. Changed clear() so that it does not
delete the underlying memory.
Revision Changes Path
1.8 +0 -48 xml-xalan/c/src/XalanDOM/XalanDOMString.cpp
Index: XalanDOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanDOM/XalanDOMString.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanDOMString.cpp 2001/02/05 22:49:07 1.7
+++ XalanDOMString.cpp 2001/02/08 21:41:01 1.8
@@ -67,10 +67,6 @@
-#if defined(XALAN_USE_CUSTOM_STRING)
-
-
-
#include <cstdlib>
@@ -456,10 +452,6 @@
-#endif
-
-
-
static inline unsigned int
length(const XalanDOMChar* theString)
{
@@ -477,10 +469,6 @@
-#if defined(XALAN_USE_CUSTOM_STRING)
-
-
-
bool
XalanDOMString::equals(
const XalanDOMChar* theLHS,
@@ -528,10 +516,6 @@
-#endif
-
-
-
static bool
doTranscodeToLocalCodePage(
const XalanDOMChar* theSourceString,
@@ -747,35 +731,3 @@
{
return doTranscodeFromLocalCodePage(theSourceString, 0, true,
theTargetVector, terminate);
}
-
-
-
-#if defined(XALAN_USE_STD_STRING)
-XALAN_DOM_EXPORT_FUNCTION(const XalanDOMString)
-TranscodeFromLocalCodePage(
- const char* theSourceString,
- unsigned int theSourceStringLength)
-{
- XalanDOMCharVectorType theResult;
-
- if (theSourceStringLength == unsigned(-1))
- {
- TranscodeFromLocalCodePage(theSourceString, theResult, false);
- }
- else
- {
- TranscodeFromLocalCodePage(theSourceString,
theSourceStringLength, theResult, false);
- }
-
- const XalanDOMCharVectorType::size_type theSize =
theResult.size();
-
- if (theSize == 0)
- {
- return XalanDOMString();
- }
- else
- {
- return XalanDOMString(&theResult[0], theSize);
- }
-}
-#endif
1.11 +8 -32 xml-xalan/c/src/XalanDOM/XalanDOMString.hpp
Index: XalanDOMString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanDOM/XalanDOMString.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanDOMString.hpp 2001/01/18 22:22:21 1.10
+++ XalanDOMString.hpp 2001/02/08 21:41:03 1.11
@@ -72,18 +72,10 @@
-#if defined(XALAN_USE_STD_STRING)
-
-#include <string>
-
-typedef std::basic_string<XalanDOMChar> XalanDOMString;
-
-#else
-
-#define XALAN_USE_CUSTOM_STRING
//#define XALAN_DOMSTRING_CACHE_SIZE
+
#include <cassert>
@@ -302,7 +294,7 @@
{
invariants();
- XalanDOMCharVectorType().swap(m_data);
+ m_data.erase(m_data.begin(), m_data.end());
#if defined(XALAN_DOMSTRING_CACHE_SIZE)
m_size = 0;
@@ -312,18 +304,8 @@
}
void
- erase()
- {
- invariants();
-
- clear();
-
- invariants();
- }
-
- void
erase(
- size_type theStartPosition,
+ size_type theStartPosition = 0,
size_type theCount = size_type(npos))
{
invariants();
@@ -333,7 +315,11 @@
if (theStartPosition == 0 && theCount == size())
{
- erase();
+ m_data.erase(m_data.begin(), m_data.end());
+
+#if defined(XALAN_DOMSTRING_CACHE_SIZE)
+ m_size = 0;
+#endif
}
else
{
@@ -976,9 +962,6 @@
-#endif
-
-
// Standard vector of XalanDOMChars and chars
#if defined(XALAN_NO_NAMESPACES)
typedef vector<XalanDOMChar> XalanDOMCharVectorType;
@@ -1098,12 +1081,6 @@
* @param theSourceStringLength The source string length.
* @return The new string.
*/
-#if defined(XALAN_USE_STD_STRING)
-XALAN_DOM_EXPORT_FUNCTION(const XalanDOMString)
-TranscodeFromLocalCodePage(
- const char* theSourceString,
- unsigned int theSourceStringLength = unsigned(-1));
-#else
inline const XalanDOMString
TranscodeFromLocalCodePage(
const char* theSourceString,
@@ -1111,7 +1088,6 @@
{
return XalanDOMString(theSourceString, theSourceStringLength);
}
-#endif
