dbertoni 2003/02/12 21:22:31
Modified: c/src/XPath XString.hpp XStringAdapter.hpp XStringCached.hpp
XStringReference.hpp
Log:
Added using declaration.
Revision Changes Path
1.20 +7 -1 xml-xalan/c/src/XPath/XString.hpp
Index: XString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XString.hpp 21 Nov 2002 01:26:18 -0000 1.19
+++ XString.hpp 13 Feb 2003 05:22:30 -0000 1.20
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,8 @@
{
public:
+ typedef XStringBase ParentType;
+
/**
* Construct an XString object from a string.
*
@@ -117,6 +119,10 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
virtual double
stringLength() const;
1.5 +7 -1 xml-xalan/c/src/XPath/XStringAdapter.hpp
Index: XStringAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringAdapter.hpp 21 Nov 2002 01:26:18 -0000 1.4
+++ XStringAdapter.hpp 13 Feb 2003 05:22:30 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,8 @@
{
public:
+ typedef XStringBase ParentType;
+
/**
* Create a string XObject that will adapt another XObject to
* behave like a string. The XObject holds a reference to the
@@ -108,6 +110,10 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
virtual double
stringLength() const;
1.5 +7 -1 xml-xalan/c/src/XPath/XStringCached.hpp
Index: XStringCached.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringCached.hpp 21 Nov 2002 01:26:18 -0000 1.4
+++ XStringCached.hpp 13 Feb 2003 05:22:30 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,8 @@
{
public:
+ typedef XStringBase ParentType;
+
typedef XPathExecutionContext::GetAndReleaseCachedString
GetAndReleaseCachedString;
/**
@@ -112,6 +114,10 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
virtual double
stringLength() const;
1.5 +7 -1 xml-xalan/c/src/XPath/XStringReference.hpp
Index: XStringReference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringReference.hpp 21 Nov 2002 01:26:18 -0000 1.4
+++ XStringReference.hpp 13 Feb 2003 05:22:30 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,8 @@
{
public:
+ typedef XStringBase ParentType;
+
/**
* Construct an XStringReference object from a string.
* The XStringReference will hold a reference to the
@@ -109,6 +111,10 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
virtual double
stringLength() const;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
