auriemma 00/11/10 08:22:27
Modified: c/src/XPath Function.hpp 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
Log:
Added cast to unicode string.
Revision Changes Path
1.7 +2 -2 xml-xalan/c/src/XPath/Function.hpp
Index: Function.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/Function.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Function.hpp 2000/11/06 19:33:03 1.6
+++ Function.hpp 2000/11/10 16:22:24 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -212,7 +212,7 @@
virtual const XalanDOMString
getError() const
{
- return "Unknown function called.";
+ return XALAN_STATIC_UCODE_STRING("Unknown function called.");
}
// Not implemented...
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionBoolean.cpp 2000/11/06 19:49:14 1.1
+++ FunctionBoolean.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -98,6 +98,7 @@
const XalanDOMString
FunctionBoolean::getError() const
{
- return "The boolean() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The boolean() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionCeiling.cpp 2000/11/06 19:49:15 1.1
+++ FunctionCeiling.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -98,6 +98,7 @@
const XalanDOMString
FunctionCeiling::getError() const
{
- return "The ceiling() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The ceiling() function takes one argument!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionConcat.cpp 2000/11/07 16:03:54 1.2
+++ FunctionConcat.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -163,6 +163,7 @@
const XalanDOMString
FunctionConcat::getError() const
{
- return "The concat() function takes at least two arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The concat() function takes at least two arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionContains.cpp 2000/11/06 19:49:15 1.1
+++ FunctionContains.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -122,6 +122,7 @@
const XalanDOMString
FunctionContains::getError() const
{
- return "The contains() function takes two arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The contains() function takes two arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionCount.cpp 2000/11/06 19:49:15 1.1
+++ FunctionCount.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -100,6 +100,7 @@
const XalanDOMString
FunctionCount::getError() const
{
- return "The count() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The count() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionFalse.cpp 2000/11/06 19:49:15 1.1
+++ FunctionFalse.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@
const XalanDOMString
FunctionFalse::getError() const
{
- return "The false() function does not accept arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The false() function does not accept arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionFloor.cpp 2000/11/06 19:49:15 1.1
+++ FunctionFloor.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -98,6 +98,7 @@
const XalanDOMString
FunctionFloor::getError() const
{
- return "The floor() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The floor() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionID.cpp 2000/11/06 19:49:15 1.1
+++ FunctionID.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -173,6 +173,7 @@
const XalanDOMString
FunctionID::getError() const
{
- return "The id() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The id() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionLang.cpp 2000/11/06 19:49:15 1.1
+++ FunctionLang.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,6 +139,7 @@
const XalanDOMString
FunctionLang::getError() const
{
- return "The lang() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The lang() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionLast.cpp 2000/11/06 19:49:15 1.1
+++ FunctionLast.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -97,6 +97,7 @@
const XalanDOMString
FunctionLast::getError() const
{
- return "The last() function does not accept arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The last() function does not accept arguments!");
}
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionLocalName.cpp 2000/11/07 16:37:38 1.2
+++ FunctionLocalName.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -154,6 +154,7 @@
const XalanDOMString
FunctionLocalName::getError() const
{
- return "The local-name() function takes zero or one arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The local-name() function takes zero or one arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionName.cpp 2000/11/06 19:49:15 1.1
+++ FunctionName.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -130,6 +130,7 @@
const XalanDOMString
FunctionName::getError() const
{
- return "The name() function takes zero or one arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The name() function takes zero or one arguments!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionNamespaceURI.cpp 2000/11/07 15:11:53 1.2
+++ FunctionNamespaceURI.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -158,6 +158,7 @@
const XalanDOMString
FunctionNamespaceURI::getError() const
{
- return "The namespace-uri() function takes zero arguments or one
argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The namespace-uri() function takes zero arguments or one
argument!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionNormalizeSpace.cpp 2000/11/07 14:58:05 1.2
+++ FunctionNormalizeSpace.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -201,6 +201,7 @@
const XalanDOMString
FunctionNormalizeSpace::getError() const
{
- return "The normalize-space() function takes zero arguments or one
argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The normalize-space() function takes zero arguments or one
argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionNot.cpp 2000/11/06 19:49:15 1.1
+++ FunctionNot.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -98,6 +98,7 @@
const XalanDOMString
FunctionNot::getError() const
{
- return "The not() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The not() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionNumber.cpp 2000/11/06 19:49:15 1.1
+++ FunctionNumber.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -136,6 +136,7 @@
const XalanDOMString
FunctionNumber::getError() const
{
- return "The number() function takes zero arguments or one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The number() function takes zero arguments or one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionPosition.cpp 2000/11/06 19:49:15 1.1
+++ FunctionPosition.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -103,6 +103,7 @@
const XalanDOMString
FunctionPosition::getError() const
{
- return "The position() function does not accept arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The position() function does not accept arguments!");
}
1.2 +5 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionRound.cpp 2000/11/06 19:49:15 1.1
+++ FunctionRound.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,8 @@
{
assert(arg1 != 0);
- return
executionContext.getXObjectFactory().createNumber(getRoundedValue(arg1->num()));
+ return executionContext.getXObjectFactory().createNumber(
+ getRoundedValue(arg1->num()));
}
@@ -148,6 +149,7 @@
const XalanDOMString
FunctionRound::getError() const
{
- return "The round() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The round() function takes one argument!");
}
1.2 +3 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionStartsWith.cpp 2000/11/06 19:49:15 1.1
+++ FunctionStartsWith.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -102,6 +102,7 @@
const XalanDOMString
FunctionStartsWith::getError() const
{
- return "The starts-with() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The starts-with() function takes one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionString.cpp 2000/11/06 19:49:15 1.1
+++ FunctionString.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -132,6 +132,7 @@
const XalanDOMString
FunctionString::getError() const
{
- return "The string() function takes zero or one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The string() function takes zero or one argument!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionStringLength.cpp 2000/11/06 19:49:15 1.1
+++ FunctionStringLength.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -137,6 +137,7 @@
const XalanDOMString
FunctionStringLength::getError() const
{
- return "The string-length() function takes zero or one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The string-length() function takes zero or one argument!");
}
1.3 +5 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionSubstring.cpp 2000/11/07 14:00:55 1.2
+++ FunctionSubstring.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -148,7 +148,8 @@
}
else
{
- return
executionContext.getXObjectFactory().createString(XalanDOMString(theBuffer.begin(),
theSize));
+ return executionContext.getXObjectFactory().createString(
+ XalanDOMString(theBuffer.begin(), theSize));
}
}
@@ -183,6 +184,7 @@
const XalanDOMString
FunctionSubstring::getError() const
{
- return "The substring() function takes two or three arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The substring() function takes two or three arguments!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionSubstringAfter.cpp 2000/11/06 22:24:22 1.2
+++ FunctionSubstringAfter.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -140,6 +140,7 @@
const XalanDOMString
FunctionSubstringAfter::getError() const
{
- return "The substring-after() function takes two arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The substring-after() function takes two arguments!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionSubstringBefore.cpp 2000/11/06 22:21:25 1.2
+++ FunctionSubstringBefore.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -138,6 +138,7 @@
const XalanDOMString
FunctionSubstringBefore::getError() const
{
- return "The substring-before() function takes two arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The substring-before() function takes two arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionSum.cpp 2000/11/06 19:49:15 1.1
+++ FunctionSum.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,6 +113,7 @@
const XalanDOMString
FunctionSum::getError() const
{
- return "The sum() function takes one argument!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The sum() function takes one argument!");
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionTranslate.cpp 2000/11/07 13:30:17 1.2
+++ FunctionTranslate.cpp 2000/11/10 16:22:24 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -160,6 +160,7 @@
const XalanDOMString
FunctionTranslate::getError() const
{
- return "The translate() function takes three arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The translate() function takes three arguments!");
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionTrue.cpp 2000/11/06 19:49:15 1.1
+++ FunctionTrue.cpp 2000/11/10 16:22:24 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@
const XalanDOMString
FunctionTrue::getError() const
{
- return "The true() function does not accept arguments!";
+ return XALAN_STATIC_UCODE_STRING(
+ "The true() function does not accept arguments!");
}