dbertoni 01/05/13 17:58:28
Modified: c/src/DOMSupport PrefixResolver.hpp DOMSupportDefault.hpp
DOMSupportDefault.cpp DOMSupport.hpp
DOMServices.hpp DOMServices.cpp
Log:
Return pointers to string instead of references for namespace-related
functions, to support empty namespace URIs.
Revision Changes Path
1.2 +1 -1 xml-xalan/c/src/DOMSupport/PrefixResolver.hpp
Index: PrefixResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/PrefixResolver.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrefixResolver.hpp 2001/01/31 01:39:26 1.1
+++ PrefixResolver.hpp 2001/05/14 00:58:27 1.2
@@ -89,7 +89,7 @@
* @param prefix Prefix to resolve
* @return namespace that prefix resolves to, or null if prefix is not
found
*/
- virtual const XalanDOMString&
+ virtual const XalanDOMString*
getNamespaceForPrefix(const XalanDOMString& prefix) const =
0;
/**
1.8 +1 -1 xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp
Index: DOMSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMSupportDefault.hpp 2001/01/08 18:12:24 1.7
+++ DOMSupportDefault.hpp 2001/05/14 00:58:27 1.8
@@ -89,7 +89,7 @@
// These interfaces are inherited from DOMSupport...
- virtual const XalanDOMString&
+ virtual const XalanDOMString*
getNamespaceForPrefix(
const XalanDOMString& prefix,
const XalanElement& namespaceContext) const;
1.10 +1 -1 xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp
Index: DOMSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMSupportDefault.cpp 2001/01/08 18:12:24 1.9
+++ DOMSupportDefault.cpp 2001/05/14 00:58:27 1.10
@@ -99,7 +99,7 @@
-const XalanDOMString&
+const XalanDOMString*
DOMSupportDefault::getNamespaceForPrefix(
const XalanDOMString& prefix,
const XalanElement& namespaceContext) const
1.8 +1 -1 xml-xalan/c/src/DOMSupport/DOMSupport.hpp
Index: DOMSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupport.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMSupport.hpp 2001/01/08 18:12:24 1.7
+++ DOMSupport.hpp 2001/05/14 00:58:27 1.8
@@ -102,7 +102,7 @@
* @param prefix prefix for a namespace
* @return URI corresponding to namespace
*/
- virtual const XalanDOMString&
+ virtual const XalanDOMString*
getNamespaceForPrefix(
const XalanDOMString& prefix,
const XalanElement& namespaceContext) const
= 0;
1.21 +1 -1 xml-xalan/c/src/DOMSupport/DOMServices.hpp
Index: DOMServices.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DOMServices.hpp 2001/05/02 15:39:25 1.20
+++ DOMServices.hpp 2001/05/14 00:58:27 1.21
@@ -541,7 +541,7 @@
* @param namespaceContext DOM element representing the context for
namespace
* @return URI corresponding to namespace
*/
- static const XalanDOMString&
+ static const XalanDOMString*
getNamespaceForPrefix(
const XalanDOMString& prefix,
const XalanElement& namespaceContext);
1.27 +3 -5 xml-xalan/c/src/DOMSupport/DOMServices.cpp
Index: DOMServices.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DOMServices.cpp 2001/05/02 15:39:22 1.26
+++ DOMServices.cpp 2001/05/14 00:58:27 1.27
@@ -728,12 +728,12 @@
// than the parser, we need to decide between demanding a
// namespace-normalized DOM as input, doing a normalize pass
// (full treewalk, expensive), or recognizing implicit declarations.
-const XalanDOMString&
+const XalanDOMString*
DOMServices::getNamespaceForPrefix(
const XalanDOMString& prefix,
const XalanElement& namespaceContext)
{
- const XalanDOMString* theNamespace = &s_emptyString;
+ const XalanDOMString* theNamespace = 0;
// Reserved xml: is hardcoded
if(equals(prefix, s_XMLString) == true)
@@ -800,9 +800,7 @@
}
}
- assert(theNamespace != 0);
-
- return *theNamespace;
+ return theNamespace;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
