dbertoni 01/09/20 11:05:36
Modified: c/src/XPath FunctionBoolean.cpp FunctionCeiling.cpp
FunctionConcat.cpp FunctionContains.cpp
FunctionCount.cpp FunctionFalse.cpp
FunctionFloor.cpp FunctionID.cpp FunctionLang.cpp
FunctionLast.cpp FunctionLocalName.cpp
FunctionName.cpp FunctionNamespaceURI.cpp
FunctionNormalizeSpace.cpp FunctionNot.cpp
FunctionNumber.cpp FunctionPosition.cpp
FunctionRound.cpp FunctionStartsWith.cpp
FunctionString.cpp FunctionStringLength.cpp
FunctionSubstring.cpp FunctionSubstringAfter.cpp
FunctionSubstringBefore.cpp FunctionSum.cpp
FunctionTranslate.cpp FunctionTrue.cpp XBoolean.cpp
XNodeSetBase.cpp XNull.cpp XNumberBase.cpp
XPathFunctionTable.cpp XResultTreeFrag.cpp
XStringBase.cpp XToken.cpp
Log:
Fixed compiler errors under msvc 7.0
Revision Changes Path
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionBoolean.cpp
Index: FunctionBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionBoolean.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionBoolean.cpp 2001/09/14 20:06:26 1.6
+++ FunctionBoolean.cpp 2001/09/20 18:05:34 1.7
@@ -103,5 +103,5 @@
const XalanDOMString
FunctionBoolean::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The boolean() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The boolean()
function takes one argument!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionCeiling.cpp
Index: FunctionCeiling.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCeiling.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionCeiling.cpp 2001/09/14 20:06:26 1.6
+++ FunctionCeiling.cpp 2001/09/20 18:05:34 1.7
@@ -103,5 +103,5 @@
const XalanDOMString
FunctionCeiling::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The ceiling() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The ceiling()
function takes one argument!"));
}
1.11 +1 -1 xml-xalan/c/src/XPath/FunctionConcat.cpp
Index: FunctionConcat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionConcat.cpp 2001/09/14 20:06:26 1.10
+++ FunctionConcat.cpp 2001/09/20 18:05:34 1.11
@@ -188,5 +188,5 @@
const XalanDOMString
FunctionConcat::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The concat() function takes at least
two arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The concat()
function takes at least two arguments!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionContains.cpp
Index: FunctionContains.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionContains.cpp 2001/09/14 20:06:26 1.6
+++ FunctionContains.cpp 2001/09/20 18:05:34 1.7
@@ -127,5 +127,5 @@
const XalanDOMString
FunctionContains::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The contains() function takes two
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
contains() function takes two arguments!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionCount.cpp
Index: FunctionCount.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCount.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionCount.cpp 2001/09/14 20:06:26 1.6
+++ FunctionCount.cpp 2001/09/20 18:05:34 1.7
@@ -105,5 +105,5 @@
const XalanDOMString
FunctionCount::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The count() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The count()
function takes one argument!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionFalse.cpp
Index: FunctionFalse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFalse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionFalse.cpp 2001/09/14 20:06:26 1.6
+++ FunctionFalse.cpp 2001/09/20 18:05:34 1.7
@@ -100,5 +100,5 @@
const XalanDOMString
FunctionFalse::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The false() function does not accept
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The false()
function does not accept arguments!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionFloor.cpp
Index: FunctionFloor.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFloor.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionFloor.cpp 2001/09/14 20:06:26 1.6
+++ FunctionFloor.cpp 2001/09/20 18:05:34 1.7
@@ -103,5 +103,5 @@
const XalanDOMString
FunctionFloor::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The floor() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The floor()
function takes one argument!"));
}
1.9 +1 -1 xml-xalan/c/src/XPath/FunctionID.cpp
Index: FunctionID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionID.cpp 2001/09/14 20:06:26 1.8
+++ FunctionID.cpp 2001/09/20 18:05:34 1.9
@@ -191,7 +191,7 @@
const XalanDOMString
FunctionID::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The id() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The id()
function takes one argument!"));
}
1.9 +1 -1 xml-xalan/c/src/XPath/FunctionLang.cpp
Index: FunctionLang.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionLang.cpp 2001/09/14 20:06:26 1.8
+++ FunctionLang.cpp 2001/09/20 18:05:34 1.9
@@ -148,5 +148,5 @@
const XalanDOMString
FunctionLang::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The lang() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The lang()
function takes one argument!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionLast.cpp
Index: FunctionLast.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionLast.cpp 2001/09/14 20:06:26 1.6
+++ FunctionLast.cpp 2001/09/20 18:05:34 1.7
@@ -102,5 +102,5 @@
const XalanDOMString
FunctionLast::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The last() function does not accept
any arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The last()
function does not accept any arguments!"));
}
1.12 +1 -2 xml-xalan/c/src/XPath/FunctionLocalName.cpp
Index: FunctionLocalName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLocalName.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionLocalName.cpp 2001/09/14 20:06:26 1.11
+++ FunctionLocalName.cpp 2001/09/20 18:05:34 1.12
@@ -179,7 +179,6 @@
const XalanDOMString
FunctionLocalName::getError() const
{
- return XALAN_STATIC_UCODE_STRING(
- "The local-name() function takes zero or one arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
local-name() function takes zero or one arguments!"));
}
1.10 +1 -1 xml-xalan/c/src/XPath/FunctionName.cpp
Index: FunctionName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionName.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionName.cpp 2001/09/14 20:06:26 1.9
+++ FunctionName.cpp 2001/09/20 18:05:34 1.10
@@ -144,5 +144,5 @@
const XalanDOMString
FunctionName::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The name() function takes zero or one
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The name()
function takes zero or one arguments!"));
}
1.13 +1 -1 xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp
Index: FunctionNamespaceURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionNamespaceURI.cpp 2001/09/14 20:06:26 1.12
+++ FunctionNamespaceURI.cpp 2001/09/20 18:05:34 1.13
@@ -150,5 +150,5 @@
const XalanDOMString
FunctionNamespaceURI::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The namespace-uri() function takes
zero arguments or one argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
namespace-uri() function takes zero arguments or one argument!"));
}
1.14 +1 -1 xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp
Index: FunctionNormalizeSpace.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionNormalizeSpace.cpp 2001/09/14 20:06:26 1.13
+++ FunctionNormalizeSpace.cpp 2001/09/20 18:05:34 1.14
@@ -233,7 +233,7 @@
const XalanDOMString
FunctionNormalizeSpace::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The normalize-space() function takes
zero arguments or one argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
normalize-space() function takes zero arguments or one argument!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionNot.cpp
Index: FunctionNot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNot.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionNot.cpp 2001/09/14 20:06:26 1.6
+++ FunctionNot.cpp 2001/09/20 18:05:34 1.7
@@ -103,5 +103,5 @@
const XalanDOMString
FunctionNot::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The not() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The not()
function takes one argument!"));
}
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionNumber.cpp
Index: FunctionNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNumber.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionNumber.cpp 2001/09/14 20:06:26 1.7
+++ FunctionNumber.cpp 2001/09/20 18:05:34 1.8
@@ -153,5 +153,5 @@
const XalanDOMString
FunctionNumber::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The number() function takes zero or
one arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The number()
function takes zero or one arguments!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionPosition.cpp
Index: FunctionPosition.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionPosition.cpp 2001/09/14 20:06:26 1.6
+++ FunctionPosition.cpp 2001/09/20 18:05:34 1.7
@@ -114,5 +114,5 @@
const XalanDOMString
FunctionPosition::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The position() function does not
accept any arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
position() function does not accept any arguments!"));
}
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionRound.cpp
Index: FunctionRound.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionRound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionRound.cpp 2001/09/14 20:06:26 1.7
+++ FunctionRound.cpp 2001/09/20 18:05:34 1.8
@@ -107,5 +107,5 @@
const XalanDOMString
FunctionRound::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The round() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The round()
function takes one argument!"));
}
1.7 +2 -2 xml-xalan/c/src/XPath/FunctionStartsWith.cpp
Index: FunctionStartsWith.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionStartsWith.cpp 2001/09/14 20:06:26 1.6
+++ FunctionStartsWith.cpp 2001/09/20 18:05:34 1.7
@@ -77,7 +77,7 @@
XObjectPtr
FunctionStartsWith::execute(
XPathExecutionContext& executionContext,
- XalanNode* context,
+ XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
const Locator* /* locator */) const
@@ -106,5 +106,5 @@
const XalanDOMString
FunctionStartsWith::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The starts-with() function takes two
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
starts-with() function takes two arguments!"));
}
1.11 +1 -1 xml-xalan/c/src/XPath/FunctionString.cpp
Index: FunctionString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionString.cpp 2001/09/14 20:06:26 1.10
+++ FunctionString.cpp 2001/09/20 18:05:34 1.11
@@ -153,5 +153,5 @@
const XalanDOMString
FunctionString::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The string() function takes zero or
one arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The string()
function takes zero or one arguments!"));
}
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionStringLength.cpp
Index: FunctionStringLength.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionStringLength.cpp 2001/09/14 20:06:26 1.7
+++ FunctionStringLength.cpp 2001/09/20 18:05:34 1.8
@@ -144,5 +144,5 @@
const XalanDOMString
FunctionStringLength::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The string-length() function takes
zero or one argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
string-length() function takes zero or one argument!"));
}
1.14 +1 -1 xml-xalan/c/src/XPath/FunctionSubstring.cpp
Index: FunctionSubstring.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionSubstring.cpp 2001/09/14 20:06:26 1.13
+++ FunctionSubstring.cpp 2001/09/20 18:05:34 1.14
@@ -272,5 +272,5 @@
const XalanDOMString
FunctionSubstring::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The substring() function takes two or
three arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring() function takes two or three arguments!"));
}
1.12 +1 -1 xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp
Index: FunctionSubstringAfter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSubstringAfter.cpp 2001/09/14 20:06:26 1.11
+++ FunctionSubstringAfter.cpp 2001/09/20 18:05:34 1.12
@@ -148,5 +148,5 @@
const XalanDOMString
FunctionSubstringAfter::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The substring-after() function takes
two arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring-after() function takes two arguments!"));
}
1.12 +1 -1 xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp
Index: FunctionSubstringBefore.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSubstringBefore.cpp 2001/09/14 20:06:26 1.11
+++ FunctionSubstringBefore.cpp 2001/09/20 18:05:34 1.12
@@ -137,5 +137,5 @@
const XalanDOMString
FunctionSubstringBefore::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The substring-before() function takes
two arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring-before() function takes two arguments!"));
}
1.9 +1 -1 xml-xalan/c/src/XPath/FunctionSum.cpp
Index: FunctionSum.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionSum.cpp 2001/09/14 20:06:26 1.8
+++ FunctionSum.cpp 2001/09/20 18:05:34 1.9
@@ -126,5 +126,5 @@
const XalanDOMString
FunctionSum::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The sum() function takes one
argument!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The sum()
function takes one argument!"));
}
1.12 +1 -1 xml-xalan/c/src/XPath/FunctionTranslate.cpp
Index: FunctionTranslate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionTranslate.cpp 2001/09/14 20:06:26 1.11
+++ FunctionTranslate.cpp 2001/09/20 18:05:34 1.12
@@ -157,5 +157,5 @@
const XalanDOMString
FunctionTranslate::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The translate() function takes three
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
translate() function takes three arguments!"));
}
1.7 +1 -1 xml-xalan/c/src/XPath/FunctionTrue.cpp
Index: FunctionTrue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTrue.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionTrue.cpp 2001/09/14 20:06:26 1.6
+++ FunctionTrue.cpp 2001/09/20 18:05:34 1.7
@@ -100,6 +100,6 @@
const XalanDOMString
FunctionTrue::getError() const
{
- return XALAN_STATIC_UCODE_STRING("The true() function does not accept
arguments!");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The true()
function does not accept arguments!"));
}
1.11 +1 -1 xml-xalan/c/src/XPath/XBoolean.cpp
Index: XBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XBoolean.cpp 2001/05/02 15:52:44 1.10
+++ XBoolean.cpp 2001/09/20 18:05:34 1.11
@@ -110,7 +110,7 @@
XalanDOMString
XBoolean::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#BOOLEAN");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#BOOLEAN"));
}
1.2 +1 -1 xml-xalan/c/src/XPath/XNodeSetBase.cpp
Index: XNodeSetBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNodeSetBase.cpp 2001/06/14 19:12:06 1.1
+++ XNodeSetBase.cpp 2001/09/20 18:05:34 1.2
@@ -111,7 +111,7 @@
XalanDOMString
XNodeSetBase::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#NODESET");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#NODESET"));
}
1.10 +1 -1 xml-xalan/c/src/XPath/XNull.cpp
Index: XNull.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNull.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XNull.cpp 2001/05/02 15:52:49 1.9
+++ XNull.cpp 2001/09/20 18:05:34 1.10
@@ -98,7 +98,7 @@
XalanDOMString
XNull::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#NULL");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#NULL"));
}
1.2 +1 -1 xml-xalan/c/src/XPath/XNumberBase.cpp
Index: XNumberBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNumberBase.cpp 2001/01/16 02:34:45 1.1
+++ XNumberBase.cpp 2001/09/20 18:05:34 1.2
@@ -90,7 +90,7 @@
XalanDOMString
XNumberBase::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#NUMBER");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#NUMBER"));
}
1.15 +3 -2 xml-xalan/c/src/XPath/XPathFunctionTable.cpp
Index: XPathFunctionTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XPathFunctionTable.cpp 2001/09/18 18:29:09 1.14
+++ XPathFunctionTable.cpp 2001/09/20 18:05:34 1.15
@@ -111,6 +111,7 @@
}
+
void
XPathFunctionTable::InstallFunction(
const XalanDOMString& theFunctionName,
@@ -137,11 +138,11 @@
}
else
{
- const int theIndex = m_FunctionCollection.size();
+ const CollectionType::size_type theIndex =
m_FunctionCollection.size();
m_FunctionCollection.push_back(theFunction.clone());
- m_FunctionNameIndex[theFunctionName] = theIndex;
+ m_FunctionNameIndex[theFunctionName] = int(theIndex);
}
}
1.25 +1 -1 xml-xalan/c/src/XPath/XResultTreeFrag.cpp
Index: XResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XResultTreeFrag.cpp 2001/07/18 04:24:59 1.24
+++ XResultTreeFrag.cpp 2001/09/20 18:05:34 1.25
@@ -128,7 +128,7 @@
XalanDOMString
XResultTreeFrag::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#RESULT_TREE_FRAG");
+ return
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#RESULT_TREE_FRAG"));
}
1.4 +1 -1 xml-xalan/c/src/XPath/XStringBase.cpp
Index: XStringBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringBase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringBase.cpp 2001/06/14 19:12:26 1.3
+++ XStringBase.cpp 2001/09/20 18:05:34 1.4
@@ -104,7 +104,7 @@
XalanDOMString
XStringBase::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#STRING");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#STRING"));
}
1.4 +1 -1 xml-xalan/c/src/XPath/XToken.cpp
Index: XToken.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XToken.cpp 2001/06/26 16:00:20 1.3
+++ XToken.cpp 2001/09/20 18:05:34 1.4
@@ -124,7 +124,7 @@
XalanDOMString
XToken::getTypeString() const
{
- return XALAN_STATIC_UCODE_STRING("#TOKEN");
+ return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("#TOKEN"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
