tng 2002/11/05 13:44:37
Modified: c/src/xercesc/dom/impl DOMDocumentImpl.hpp
Log:
Do not code using namespace in a global header.
Revision Changes Path
1.12 +7 -9 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp
Index: DOMDocumentImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMDocumentImpl.hpp 4 Nov 2002 15:07:34 -0000 1.11
+++ DOMDocumentImpl.hpp 5 Nov 2002 21:44:37 -0000 1.12
@@ -375,25 +375,23 @@
XERCES_CPP_NAMESPACE_END
-XERCES_CPP_NAMESPACE_USE
-
// ---------------------------------------------------------------------------
//
// Operator new. Global overloaded version, lets any object be allocated on
// the heap owned by a document.
//
// ---------------------------------------------------------------------------
-inline void * operator new(size_t amt, DOMDocument *doc,
DOMDocumentImpl::NodeObjectType type)
+inline void * operator new(size_t amt, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
*doc, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl::NodeObjectType type)
{
// revist. Probably should be a checked cast.
- void *p = ((DOMDocumentImpl *)doc)->allocate(amt, type);
+ void *p = ((XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl
*)doc)->allocate(amt, type);
return p;
}
-inline void * operator new(size_t amt, DOMDocument *doc)
+inline void * operator new(size_t amt, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
*doc)
{
// revist. Probably should be a checked cast.
- void *p = ((DOMDocumentImpl *)doc)->allocate(amt);
+ void *p = ((XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl
*)doc)->allocate(amt);
return p;
}
@@ -403,11 +401,11 @@
// no matching operator delete found; memory will not be freed if initialization
throws an exception
// ---------------------------------------------------------------------------
#if _MSC_VER >= 1200 /* VC++ 6.0 */
-inline void operator delete(void* ptr, DOMDocument *doc)
+inline void operator delete(void* ptr, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
*doc)
{
return;
}
-inline void operator delete(void* ptr, DOMDocument *doc,
DOMDocumentImpl::NodeObjectType type)
+inline void operator delete(void* ptr, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
*doc, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl::NodeObjectType type)
{
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
