dbertoni 2002/11/21 18:18:35
Modified: c/src/XalanSourceTree FormatterToSourceTree.cpp
FormatterToSourceTree.hpp XalanSourceTreeAttr.cpp
XalanSourceTreeAttr.hpp XalanSourceTreeAttrNS.cpp
XalanSourceTreeAttrNS.hpp
XalanSourceTreeAttributeAllocator.cpp
XalanSourceTreeAttributeAllocator.hpp
XalanSourceTreeAttributeNSAllocator.cpp
XalanSourceTreeAttributeNSAllocator.hpp
XalanSourceTreeComment.cpp
XalanSourceTreeComment.hpp
XalanSourceTreeCommentAllocator.cpp
XalanSourceTreeCommentAllocator.hpp
XalanSourceTreeContentHandler.cpp
XalanSourceTreeContentHandler.hpp
XalanSourceTreeDOMSupport.cpp
XalanSourceTreeDOMSupport.hpp
XalanSourceTreeDefinitions.hpp
XalanSourceTreeDocument.cpp
XalanSourceTreeDocument.hpp
XalanSourceTreeDocumentFragment.cpp
XalanSourceTreeDocumentFragment.hpp
XalanSourceTreeElement.cpp
XalanSourceTreeElement.hpp
XalanSourceTreeElementAllocator.cpp
XalanSourceTreeElementAllocator.hpp
XalanSourceTreeElementNS.cpp
XalanSourceTreeElementNS.hpp
XalanSourceTreeElementNSAllocator.cpp
XalanSourceTreeElementNSAllocator.hpp
XalanSourceTreeHelper.cpp XalanSourceTreeHelper.hpp
XalanSourceTreeInit.cpp XalanSourceTreeInit.hpp
XalanSourceTreeNamedNodeMap.cpp
XalanSourceTreeNamedNodeMap.hpp
XalanSourceTreeParserLiaison.cpp
XalanSourceTreeParserLiaison.hpp
XalanSourceTreeProcessingInstruction.cpp
XalanSourceTreeProcessingInstruction.hpp
XalanSourceTreeProcessingInstructionAllocator.cpp
XalanSourceTreeProcessingInstructionAllocator.hpp
XalanSourceTreeText.cpp XalanSourceTreeText.hpp
XalanSourceTreeTextAllocator.cpp
XalanSourceTreeTextAllocator.hpp
XalanSourceTreeTextIWS.cpp
XalanSourceTreeTextIWS.hpp
XalanSourceTreeTextIWSAllocator.cpp
XalanSourceTreeTextIWSAllocator.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.14 +13 -5 xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp
Index: FormatterToSourceTree.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FormatterToSourceTree.cpp 5 Sep 2002 01:38:53 -0000 1.13
+++ FormatterToSourceTree.cpp 22 Nov 2002 02:18:32 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,6 +91,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FormatterToSourceTree::FormatterToSourceTree(XalanSourceTreeDocument*
theDocument) :
FormatterListener(OUTPUT_METHOD_DOM),
m_document(theDocument),
@@ -130,7 +134,7 @@
void
-FormatterToSourceTree::setDocumentLocator(const Locator* const
/* locator */)
+FormatterToSourceTree::setDocumentLocator(const LocatorType* const /*
locator */)
{
}
@@ -236,8 +240,8 @@
void
FormatterToSourceTree::startElement(
- const XMLCh* const name,
- AttributeList& attrs)
+ const XMLCh* const name,
+ AttributeListType& attrs)
{
processAccumulatedText();
@@ -462,7 +466,7 @@
XalanSourceTreeElement*
FormatterToSourceTree::createElementNode(
const XalanDOMChar* name,
- AttributeList& attrs,
+ AttributeListType& attrs,
XalanSourceTreeElement* theParentElement)
{
if (m_prefixResolver != 0)
@@ -489,3 +493,7 @@
m_lastChild,
m_document->createProcessingInstructionNode(target,
data));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +13 -5 xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp
Index: FormatterToSourceTree.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FormatterToSourceTree.hpp 1 Nov 2001 15:51:14 -0000 1.10
+++ FormatterToSourceTree.hpp 22 Nov 2002 02:18:32 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class PrefixResolver;
class XalanNode;
class XalanSourceTreeDocument;
@@ -195,7 +199,7 @@
entityReference(const XMLCh* const name);
virtual void
- setDocumentLocator(const Locator* const locator);
+ setDocumentLocator(const LocatorType* const locator);
virtual void
startDocument();
@@ -205,8 +209,8 @@
virtual void
startElement(
- const XMLCh* const name,
- AttributeList& attrs);
+ const XMLCh* const name,
+ AttributeListType& attrs);
virtual void
endElement(const XMLCh* const name);
@@ -238,7 +242,7 @@
XalanSourceTreeElement*
createElementNode(
const XalanDOMChar* name,
- AttributeList& attrs,
+ AttributeListType& attrs,
XalanSourceTreeElement* theParentElement);
void
@@ -273,6 +277,10 @@
XalanDOMString m_textBuffer;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttr.cpp
Index: XalanSourceTreeAttr.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanSourceTreeAttr.cpp 23 Feb 2002 03:16:05 -0000 1.4
+++ XalanSourceTreeAttr.cpp 22 Nov 2002 02:18:32 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -382,3 +386,7 @@
{
return m_ownerElement;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttr.hpp
Index: XalanSourceTreeAttr.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttr.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeAttr.hpp 20 Nov 2002 02:32:01 -0000 1.5
+++ XalanSourceTreeAttr.hpp 22 Nov 2002 02:18:32 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDocument;
class XalanSourceTreeElement;
@@ -554,6 +558,10 @@
unsigned long m_index;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttrNS.cpp
Index: XalanSourceTreeAttrNS.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttrNS.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeAttrNS.cpp 15 Dec 2000 23:23:25 -0000 1.1
+++ XalanSourceTreeAttrNS.cpp 22 Nov 2002 02:18:32 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeAttrNS::XalanSourceTreeAttrNS(
const XalanDOMString& theName,
const XalanDOMString& theLocalName,
@@ -146,3 +150,7 @@
{
return m_localName;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttrNS.hpp
Index: XalanSourceTreeAttrNS.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttrNS.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeAttrNS.hpp 18 Dec 2000 17:30:58 -0000 1.2
+++ XalanSourceTreeAttrNS.hpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/*
* <meta name="usage" content="experimental"/>
*
@@ -145,6 +149,10 @@
const XalanDOMString& m_namespaceURI;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeAllocator.cpp
Index: XalanSourceTreeAttributeAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeAttributeAllocator.cpp 15 Dec 2000 23:23:25 -0000
1.1
+++ XalanSourceTreeAttributeAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeAttributeAllocator::XalanSourceTreeAttributeAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -101,3 +105,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeAllocator.hpp
Index: XalanSourceTreeAttributeAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeAttributeAllocator.hpp 15 Dec 2000 23:23:25 -0000
1.1
+++ XalanSourceTreeAttributeAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeAttributeAllocator
{
public:
@@ -156,6 +160,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeNSAllocator.cpp
Index: XalanSourceTreeAttributeNSAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeNSAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeAttributeNSAllocator.cpp 15 Dec 2000 23:23:25 -0000
1.1
+++ XalanSourceTreeAttributeNSAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeAttributeNSAllocator::XalanSourceTreeAttributeNSAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -107,3 +111,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeNSAllocator.hpp
Index: XalanSourceTreeAttributeNSAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeAttributeNSAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeAttributeNSAllocator.hpp 15 Dec 2000 23:23:25 -0000
1.1
+++ XalanSourceTreeAttributeNSAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeAttributeNSAllocator
{
public:
@@ -161,6 +165,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +13 -5
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.cpp
Index: XalanSourceTreeComment.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanSourceTreeComment.cpp 5 Sep 2002 07:10:30 -0000 1.10
+++ XalanSourceTreeComment.cpp 22 Nov 2002 02:18:32 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -509,11 +513,11 @@
-static XalanDOMString s_nameString;
+static XalanDOMString s_staticNameString;
-const XalanDOMString& XalanSourceTreeComment::s_nameString =
::s_nameString;
+const XalanDOMString& XalanSourceTreeComment::s_nameString =
s_staticNameString;
@@ -535,7 +539,7 @@
void
XalanSourceTreeComment::initialize()
{
- ::s_nameString = s_comment;
+ s_staticNameString = s_comment;
}
@@ -543,5 +547,9 @@
void
XalanSourceTreeComment::terminate()
{
- releaseMemory(::s_nameString);
+ releaseMemory(s_staticNameString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.hpp
Index: XalanSourceTreeComment.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanSourceTreeComment.hpp 6 Nov 2002 23:35:09 -0000 1.6
+++ XalanSourceTreeComment.hpp 22 Nov 2002 02:18:32 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDocument;
class XalanSourceTreeDocumentFragment;
class XalanSourceTreeElement;
@@ -668,6 +672,10 @@
static const XalanDOMString& s_nameString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeCommentAllocator.cpp
Index: XalanSourceTreeCommentAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeCommentAllocator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeCommentAllocator.cpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeCommentAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeCommentAllocator::XalanSourceTreeCommentAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -105,3 +109,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeCommentAllocator.hpp
Index: XalanSourceTreeCommentAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeCommentAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeCommentAllocator.hpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeCommentAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeCommentAllocator
{
public:
@@ -159,6 +163,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +14 -6
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp
Index: XalanSourceTreeContentHandler.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XalanSourceTreeContentHandler.cpp 6 Nov 2002 23:40:15 -0000 1.15
+++ XalanSourceTreeContentHandler.cpp 22 Nov 2002 02:18:32 -0000 1.16
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeContentHandler::XalanSourceTreeContentHandler(
XalanSourceTreeDocument* theDocument,
bool
fAccumulateText) :
@@ -271,7 +275,7 @@
void
-XalanSourceTreeContentHandler::setDocumentLocator(const Locator* const
/* locator */)
+XalanSourceTreeContentHandler::setDocumentLocator(const LocatorType* const
/* locator */)
{
}
@@ -310,10 +314,10 @@
void
XalanSourceTreeContentHandler::startElement(
- const XMLCh* const uri,
- const XMLCh* const localname,
- const XMLCh* const qname,
- const Attributes& attrs)
+ const XMLCh* const uri,
+ const XMLCh* const localname,
+ const XMLCh* const qname,
+ const AttributesType& attrs)
{
#if 0
assert(m_inDTD == false);
@@ -495,7 +499,7 @@
const XMLCh* const uri,
const XMLCh* const localname,
const XMLCh* const qname,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanSourceTreeElement* theOwnerElement)
{
assert(m_inDTD == false);
@@ -546,3 +550,7 @@
doAppendChildNode(m_currentElement, m_lastChild, theNewTextNode);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +37 -8
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp
Index: XalanSourceTreeContentHandler.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanSourceTreeContentHandler.hpp 6 Nov 2002 23:40:15 -0000 1.9
+++ XalanSourceTreeContentHandler.hpp 22 Nov 2002 02:18:32 -0000 1.10
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,13 +78,38 @@
+XALAN_DECLARE_XERCES_CLASS(Attributes)
+XALAN_DECLARE_XERCES_CLASS(AttributeList)
+XALAN_DECLARE_XERCES_CLASS(ContentHandler);
+XALAN_DECLARE_XERCES_CLASS(DTDHandler);
+XALAN_DECLARE_XERCES_CLASS(LexicalHandler);
+XALAN_DECLARE_XERCES_CLASS(Locator);
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler
ContentHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler DTDHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler
LexicalHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator
LocatorType;
+
+
+
class XalanNode;
class XalanSourceTreeDocument;
class XalanSourceTreeElement;
-class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeContentHandler : public
ContentHandler, public DTDHandler, public LexicalHandler
+class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeContentHandler :
+ public ContentHandlerType,
+ public DTDHandlerType,
+ public LexicalHandlerType
{
public:
@@ -135,17 +160,17 @@
const XMLCh* const data);
virtual void
- setDocumentLocator(const Locator* const locator);
+ setDocumentLocator(const LocatorType* const locator);
virtual void
startDocument();
virtual void
startElement(
- const XMLCh* const uri,
- const XMLCh* const localname,
- const XMLCh* const qname,
- const Attributes& attrs);
+ const XMLCh* const uri,
+ const XMLCh* const localname,
+ const XMLCh* const qname,
+ const AttributesType& attrs);
virtual void
startPrefixMapping(
@@ -236,7 +261,7 @@
const XMLCh* const uri,
const XMLCh* const localname,
const XMLCh* const qname,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanSourceTreeElement* theOwnerElement);
void
@@ -279,6 +304,10 @@
// A flag to determine if the DTD is being processed.
bool m_inDTD;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDOMSupport.cpp
Index: XalanSourceTreeDOMSupport.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDOMSupport.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanSourceTreeDOMSupport.cpp 10 May 2002 21:42:57 -0000 1.7
+++ XalanSourceTreeDOMSupport.cpp 22 Nov 2002 02:18:32 -0000 1.8
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -141,3 +145,7 @@
return node1.getIndex() > node2.getIndex() ? true : false;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDOMSupport.hpp
Index: XalanSourceTreeDOMSupport.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDOMSupport.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanSourceTreeDOMSupport.hpp 10 May 2002 21:42:57 -0000 1.7
+++ XalanSourceTreeDOMSupport.hpp 22 Nov 2002 02:18:32 -0000 1.8
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeParserLiaison;
@@ -114,6 +118,10 @@
const XalanSourceTreeParserLiaison* m_parserLiaison;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +1 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDefinitions.hpp
Index: XalanSourceTreeDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDefinitions.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeDefinitions.hpp 15 Dec 2000 23:24:12 -0000 1.1
+++ XalanSourceTreeDefinitions.hpp 22 Nov 2002 02:18:32 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.33 +31 -23
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp
Index: XalanSourceTreeDocument.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XalanSourceTreeDocument.cpp 9 Nov 2002 00:40:25 -0000 1.32
+++ XalanSourceTreeDocument.cpp 22 Nov 2002 02:18:32 -0000 1.33
@@ -80,6 +80,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -581,7 +585,7 @@
static bool
-hasXMLNamespaceAttribute(const AttributeList& attrs)
+hasXMLNamespaceAttribute(const AttributeListType& attrs)
{
const unsigned int theLength = attrs.getLength();
@@ -603,7 +607,7 @@
static bool
-hasXMLNamespaceAttribute(const Attributes& attrs)
+hasXMLNamespaceAttribute(const AttributesType& attrs)
{
const unsigned int theLength = attrs.getLength();
@@ -626,12 +630,12 @@
XalanSourceTreeElement*
XalanSourceTreeDocument::createElementNode(
- const XalanDOMChar* name,
- const AttributeList& attrs,
- XalanNode* theParentNode,
- XalanNode*
thePreviousSibling,
- XalanNode* theNextSibling,
- bool
fAddXMLNamespaceAttribute)
+ const XalanDOMChar* name,
+ const AttributeListType& attrs,
+ XalanNode*
theParentNode,
+ XalanNode*
thePreviousSibling,
+ XalanNode*
theNextSibling,
+ bool
fAddXMLNamespaceAttribute)
{
// We might have typedef'ed this to something smaller than unsigned int.
AttributesCountType theAttributeCount =
AttributesCountType(attrs.getLength());
@@ -725,13 +729,13 @@
XalanSourceTreeElement*
XalanSourceTreeDocument::createElementNode(
- const XalanDOMChar* tagName,
- const AttributeList& attrs,
- const PrefixResolver& thePrefixResolver,
- XalanNode* theParentNode,
- XalanNode*
thePreviousSibling,
- XalanNode* theNextSibling,
- bool
fAddXMLNamespaceAttribute)
+ const XalanDOMChar* tagName,
+ const AttributeListType& attrs,
+ const PrefixResolver& thePrefixResolver,
+ XalanNode*
theParentNode,
+ XalanNode*
thePreviousSibling,
+ XalanNode*
theNextSibling,
+ bool
fAddXMLNamespaceAttribute)
{
// We might have typedef'ed this to something smaller than unsigned int.
AttributesCountType theAttributeCount =
AttributesCountType(attrs.getLength());
@@ -849,7 +853,7 @@
const XalanDOMChar* uri,
const XalanDOMChar* localname,
const XalanDOMChar* qname,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanNode* theParentNode,
XalanNode*
thePreviousSibling,
XalanNode* theNextSibling,
@@ -908,7 +912,7 @@
XalanSourceTreeElement*
XalanSourceTreeDocument::createElementNode(
const XalanDOMChar* name,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanNode* theParentNode,
XalanNode*
thePreviousSibling,
XalanNode* theNextSibling,
@@ -1018,7 +1022,7 @@
assign(theString, chars, length);
- assert(length == ::length(theString));
+ assert(length == theString.length());
return theString;
}
@@ -1277,7 +1281,7 @@
void
XalanSourceTreeDocument::createAttributes(
- const Attributes& theAttributes,
+ const AttributesType& theAttributes,
XalanSourceTreeAttr** theAttributeVector,
XalanSourceTreeElement* theOwnerElement,
bool
fAddXMLNamespaceAttribute)
@@ -1423,11 +1427,11 @@
-static XalanDOMString s_nameString;
+static XalanDOMString s_staticNameString;
-const XalanDOMString& XalanSourceTreeDocument::s_nameString =
::s_nameString;
+const XalanDOMString& XalanSourceTreeDocument::s_nameString =
s_staticNameString;
@@ -1450,7 +1454,7 @@
void
XalanSourceTreeDocument::initialize()
{
- ::s_nameString = s_document;
+ s_staticNameString = s_document;
}
@@ -1458,5 +1462,9 @@
void
XalanSourceTreeDocument::terminate()
{
- releaseMemory(::s_nameString);
+ releaseMemory(s_staticNameString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +28 -12
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp
Index: XalanSourceTreeDocument.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XalanSourceTreeDocument.hpp 21 Sep 2002 01:23:23 -0000 1.18
+++ XalanSourceTreeDocument.hpp 22 Nov 2002 02:18:32 -0000 1.19
@@ -92,8 +92,20 @@
-class AttributeList;
-class Attributes;
+XALAN_DECLARE_XERCES_CLASS(Attributes)
+XALAN_DECLARE_XERCES_CLASS(AttributeList)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+
+
+
class PrefixResolver;
class XalanSourceTreeAttr;
@@ -371,19 +383,19 @@
XalanSourceTreeElement*
createElementNode(
- const XalanDOMChar* name,
- const AttributeList& attrs,
- XalanNode* theParentNode =
0,
- XalanNode*
thePreviousSibling = 0,
- XalanNode* theNextSibling
= 0,
- bool
fAddXMLNamespaceAttribute = false);
+ const XalanDOMChar* name,
+ const AttributeListType& attrs,
+ XalanNode*
theParentNode = 0,
+ XalanNode*
thePreviousSibling = 0,
+ XalanNode*
theNextSibling = 0,
+ bool
fAddXMLNamespaceAttribute = false);
XalanSourceTreeElement*
createElementNode(
const XalanDOMChar* uri,
const XalanDOMChar* localname,
const XalanDOMChar* qname,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanNode*
theParentNode = 0,
XalanNode*
thePreviousSibling = 0,
XalanNode*
theNextSibling = 0,
@@ -392,7 +404,7 @@
XalanSourceTreeElement*
createElementNode(
const XalanDOMChar* tagName,
- const AttributeList& attrs,
+ const AttributeListType& attrs,
const PrefixResolver& thePrefixResolver,
XalanNode*
theParentNode = 0,
XalanNode*
thePreviousSibling = 0,
@@ -402,7 +414,7 @@
XalanSourceTreeElement*
createElementNode(
const XalanDOMChar* name,
- const Attributes& attrs,
+ const AttributesType& attrs,
XalanNode*
theParentNode = 0,
XalanNode*
thePreviousSibling = 0,
XalanNode*
theNextSibling = 0,
@@ -488,7 +500,7 @@
void
createAttributes(
- const Attributes& theAttributes,
+ const AttributesType& theAttributes,
XalanSourceTreeAttr** theAttributeVector,
XalanSourceTreeElement* theOwnerElement,
bool
fAddXMLNamespaceAttribute);
@@ -556,6 +568,10 @@
static const XalanDOMString&
s_nameString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp
Index: XalanSourceTreeDocumentFragment.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanSourceTreeDocumentFragment.cpp 16 Apr 2002 05:43:50 -0000
1.4
+++ XalanSourceTreeDocumentFragment.cpp 22 Nov 2002 02:18:32 -0000
1.5
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -376,3 +380,7 @@
{
m_firstChild = 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp
Index: XalanSourceTreeDocumentFragment.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeDocumentFragment.hpp 16 Apr 2002 06:02:01 -0000
1.5
+++ XalanSourceTreeDocumentFragment.hpp 22 Nov 2002 02:18:32 -0000
1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeComment;
class XalanSourceTreeDocument;
class XalanSourceTreeElement;
@@ -225,6 +229,10 @@
XalanNode* m_firstChild;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.cpp
Index: XalanSourceTreeElement.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanSourceTreeElement.cpp 23 Feb 2002 03:13:09 -0000 1.7
+++ XalanSourceTreeElement.cpp 22 Nov 2002 02:18:32 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -708,3 +712,7 @@
// Dummy return value...
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.hpp
Index: XalanSourceTreeElement.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanSourceTreeElement.hpp 6 Nov 2002 23:35:09 -0000 1.7
+++ XalanSourceTreeElement.hpp 22 Nov 2002 02:18:32 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeAttr;
class XalanSourceTreeComment;
class XalanSourceTreeDocument;
@@ -886,6 +890,10 @@
const AttributesCountType m_attributeCount;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementAllocator.cpp
Index: XalanSourceTreeElementAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementAllocator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementAllocator.cpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeElementAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeElementAllocator::XalanSourceTreeElementAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -109,3 +113,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementAllocator.hpp
Index: XalanSourceTreeElementAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementAllocator.hpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeElementAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeElementAllocator
{
public:
@@ -165,6 +169,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNS.cpp
Index: XalanSourceTreeElementNS.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNS.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementNS.cpp 1 Nov 2001 15:51:14 -0000 1.3
+++ XalanSourceTreeElementNS.cpp 22 Nov 2002 02:18:32 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeElementNS::XalanSourceTreeElementNS(
const XalanDOMString& theTagName,
const XalanDOMString& theLocalName,
@@ -154,3 +158,7 @@
{
return m_localName;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNS.hpp
Index: XalanSourceTreeElementNS.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNS.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementNS.hpp 1 Nov 2001 15:51:14 -0000 1.3
+++ XalanSourceTreeElementNS.hpp 22 Nov 2002 02:18:32 -0000 1.4
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeElementNS : public
XalanSourceTreeElement
{
public:
@@ -145,6 +149,10 @@
const XalanDOMString& m_namespaceURI;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNSAllocator.cpp
Index: XalanSourceTreeElementNSAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNSAllocator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementNSAllocator.cpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeElementNSAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeElementNSAllocator::XalanSourceTreeElementNSAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -115,3 +119,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNSAllocator.hpp
Index: XalanSourceTreeElementNSAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElementNSAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElementNSAllocator.hpp 1 Nov 2001 15:51:14 -0000
1.3
+++ XalanSourceTreeElementNSAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.4
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeElementNSAllocator
{
public:
@@ -171,6 +175,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeHelper.cpp
Index: XalanSourceTreeHelper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeHelper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeHelper.cpp 1 Nov 2001 15:51:14 -0000 1.5
+++ XalanSourceTreeHelper.cpp 22 Nov 2002 02:18:32 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
inline XalanSourceTreeComment*
castToComment(XalanNode* theNode)
{
@@ -569,3 +573,7 @@
{
return doGetLastSibling(theNode);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeHelper.hpp
Index: XalanSourceTreeHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeHelper.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanSourceTreeHelper.hpp 1 Nov 2001 15:51:14 -0000 1.4
+++ XalanSourceTreeHelper.hpp 22 Nov 2002 02:18:32 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
class XalanSourceTreeComment;
class XalanSourceTreeDocument;
@@ -192,6 +196,10 @@
XalanSourceTreeHelper(const XalanSourceTreeHelper&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeInit.cpp
Index: XalanSourceTreeInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeInit.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanSourceTreeInit.cpp 2 Oct 2001 21:34:19 -0000 1.4
+++ XalanSourceTreeInit.cpp 22 Nov 2002 02:18:32 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
unsigned long XalanSourceTreeInit::s_initCounter = 0;
@@ -117,3 +121,7 @@
XalanSourceTreeDocument::terminate();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeInit.hpp
Index: XalanSourceTreeInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeInit.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeInit.hpp 15 Dec 2000 23:24:12 -0000 1.1
+++ XalanSourceTreeInit.hpp 22 Nov 2002 02:18:32 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeInit
{
public:
@@ -113,6 +117,10 @@
static unsigned long s_initCounter;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeNamedNodeMap.cpp
Index: XalanSourceTreeNamedNodeMap.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeNamedNodeMap.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeNamedNodeMap.cpp 8 Jan 2001 18:22:37 -0000 1.2
+++ XalanSourceTreeNamedNodeMap.cpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeNamedNodeMap::XalanSourceTreeNamedNodeMap(const
XalanSourceTreeElement* theElement) :
m_element(theElement)
@@ -202,3 +206,7 @@
// Dummy return value...
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeNamedNodeMap.hpp
Index: XalanSourceTreeNamedNodeMap.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeNamedNodeMap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeNamedNodeMap.hpp 15 Dec 2000 23:24:12 -0000 1.1
+++ XalanSourceTreeNamedNodeMap.hpp 22 Nov 2002 02:18:32 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeElement;
@@ -263,6 +267,10 @@
const XalanSourceTreeElement* m_element;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.31 +24 -16
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
Index: XalanSourceTreeParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XalanSourceTreeParserLiaison.cpp 15 Aug 2002 00:59:53 -0000 1.30
+++ XalanSourceTreeParserLiaison.cpp 22 Nov 2002 02:18:32 -0000 1.31
@@ -82,6 +82,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// http://xml.org/sax/features/validation
const XalanDOMChar XalanSourceTreeParserLiaison::s_validationString[] = {
XalanUnicode::charLetter_h,
@@ -556,8 +560,8 @@
void
XalanSourceTreeParserLiaison::parseXMLStream(
- const InputSource& inputSource,
- DocumentHandler& handler,
+ const InputSourceType& inputSource,
+ DocumentHandlerType& handler,
const XalanDOMString& identifier)
{
m_xercesParserLiaison.parseXMLStream(inputSource, handler, identifier);
@@ -567,12 +571,12 @@
XalanDocument*
XalanSourceTreeParserLiaison::parseXMLStream(
- const InputSource& inputSource,
+ const InputSourceType& inputSource,
const XalanDOMString& /* identifier */)
{
XalanSourceTreeContentHandler
theContentHandler(createXalanSourceTreeDocument());
- XalanAutoPtr<SAX2XMLReader> theReader(createReader());
+ XalanAutoPtr<SAX2XMLReaderType> theReader(createReader());
theReader->setContentHandler(&theContentHandler);
@@ -662,13 +666,13 @@
void
XalanSourceTreeParserLiaison::parseXMLStream(
- const InputSource& theInputSource,
- ContentHandler& theContentHandler,
- DTDHandler* theDTDHandler,
- LexicalHandler* theLexicalHandler,
+ const InputSourceType& theInputSource,
+ ContentHandlerType& theContentHandler,
+ DTDHandlerType* theDTDHandler,
+ LexicalHandlerType* theLexicalHandler,
const XalanDOMString& /* theIdentifier */)
{
- XalanAutoPtr<SAX2XMLReader> theReader(createReader());
+ XalanAutoPtr<SAX2XMLReaderType> theReader(createReader());
theReader->setContentHandler(&theContentHandler);
@@ -697,7 +701,7 @@
-ErrorHandler*
+ErrorHandlerType*
XalanSourceTreeParserLiaison::getErrorHandler() const
{
return m_xercesParserLiaison.getErrorHandler();
@@ -706,7 +710,7 @@
void
-XalanSourceTreeParserLiaison::setErrorHandler(ErrorHandler* handler)
+XalanSourceTreeParserLiaison::setErrorHandler(ErrorHandlerType*
handler)
{
m_xercesParserLiaison.setErrorHandler(handler);
}
@@ -745,7 +749,7 @@
-EntityResolver*
+EntityResolverType*
XalanSourceTreeParserLiaison::getEntityResolver() const
{
return m_xercesParserLiaison.getEntityResolver();
@@ -754,7 +758,7 @@
void
-XalanSourceTreeParserLiaison::setEntityResolver(EntityResolver*
resolver)
+XalanSourceTreeParserLiaison::setEntityResolver(EntityResolverType*
resolver)
{
m_xercesParserLiaison.setEntityResolver(resolver);
}
@@ -817,10 +821,10 @@
-SAX2XMLReader*
+SAX2XMLReaderType*
XalanSourceTreeParserLiaison::createReader()
{
- XalanAutoPtr<SAX2XMLReader>
theReader(XMLReaderFactory::createXMLReader());
+ XalanAutoPtr<SAX2XMLReaderType>
theReader(XERCES_CPP_NAMESPACE_QUALIFIER XMLReaderFactory::createXMLReader());
const bool fValidate = m_xercesParserLiaison.getUseValidation();
@@ -853,7 +857,7 @@
s_namespacePrefixesString,
true);
- ErrorHandler* const theHandler = getErrorHandler();
+ ErrorHandlerType* const theHandler = getErrorHandler();
if (theHandler == 0)
{
@@ -900,3 +904,7 @@
return theReader.release();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.21 +34 -16
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
Index: XalanSourceTreeParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XalanSourceTreeParserLiaison.hpp 15 Aug 2002 00:59:53 -0000 1.20
+++ XalanSourceTreeParserLiaison.hpp 22 Nov 2002 02:18:32 -0000 1.21
@@ -73,15 +73,29 @@
-class ContentHandler;
-class DTDHandler;
-class LexicalHandler;
-class SAX2XMLReader;
+XALAN_DECLARE_XERCES_CLASS(ContentHandler);
+XALAN_DECLARE_XERCES_CLASS(DTDHandler);
+XALAN_DECLARE_XERCES_CLASS(LexicalHandler);
+XALAN_DECLARE_XERCES_CLASS(SAX2XMLReader);
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDOMSupport;
class XalanSourceTreeDocument;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler
ContentHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler
DTDHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler
LexicalHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER SAX2XMLReader
SAX2XMLReaderType;
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeParserLiaison : public
XMLParserLiaison
{
public:
@@ -140,13 +154,13 @@
virtual XalanDocument*
parseXMLStream(
- const InputSource& reader,
+ const InputSourceType& reader,
const XalanDOMString& identifier = XalanDOMString());
virtual void
parseXMLStream(
- const InputSource& inputSource,
- DocumentHandler& handler,
+ const InputSourceType& inputSource,
+ DocumentHandlerType& handler,
const XalanDOMString& identifier = XalanDOMString());
virtual XalanDocument*
@@ -173,11 +187,11 @@
virtual const XalanDOMString
getParserDescription() const;
- virtual EntityResolver*
+ virtual EntityResolverType*
getEntityResolver() const;
virtual void
- setEntityResolver(EntityResolver* resolver);
+ setEntityResolver(EntityResolverType* resolver);
// These interfaces are new to XalanSourceTreeParserLiaison...
@@ -193,10 +207,10 @@
*/
virtual void
parseXMLStream(
- const InputSource& theInputSource,
- ContentHandler& theContentHandler,
- DTDHandler* theDTDHandler =
0,
- LexicalHandler* theLexicalHandler = 0,
+ const InputSourceType& theInputSource,
+ ContentHandlerType& theContentHandler,
+ DTDHandlerType* theDTDHandler = 0,
+ LexicalHandlerType* theLexicalHandler = 0,
const XalanDOMString& theIdentifier =
XalanDOMString());
/** Get the 'include ignorable whitespace' flag.
@@ -238,7 +252,7 @@
*
* @return A pointer to the installed error handler object.
*/
- virtual ErrorHandler*
+ virtual ErrorHandlerType*
getErrorHandler() const;
/**
@@ -252,7 +266,7 @@
* @see Parser#setErrorHandler
*/
virtual void
- setErrorHandler(ErrorHandler* handler);
+ setErrorHandler(ErrorHandlerType* handler);
/**
* This method returns the state of the parser's namespace
@@ -383,7 +397,7 @@
protected:
- virtual SAX2XMLReader*
+ virtual SAX2XMLReaderType*
createReader();
private:
@@ -416,6 +430,10 @@
static const XalanDOMChar
s_externalNoNamespaceSchemaLocationString[];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp
Index: XalanSourceTreeProcessingInstruction.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanSourceTreeProcessingInstruction.cpp 23 Feb 2002 03:15:33 -0000
1.6
+++ XalanSourceTreeProcessingInstruction.cpp 22 Nov 2002 02:18:32 -0000
1.7
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -464,3 +468,7 @@
{
XalanSourceTreeHelper::appendSibling(this, m_nextSibling, theSibling);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp
Index: XalanSourceTreeProcessingInstruction.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeProcessingInstruction.hpp 6 Nov 2002 23:35:09 -0000
1.5
+++ XalanSourceTreeProcessingInstruction.hpp 22 Nov 2002 02:18:32 -0000
1.6
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeComment;
class XalanSourceTreeDocument;
class XalanSourceTreeDocumentFragment;
@@ -562,6 +566,10 @@
unsigned long m_index;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstructionAllocator.cpp
Index: XalanSourceTreeProcessingInstructionAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstructionAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeProcessingInstructionAllocator.cpp 1 Nov 2001 15:51:14
-0000 1.2
+++ XalanSourceTreeProcessingInstructionAllocator.cpp 22 Nov 2002 02:18:32
-0000 1.3
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeProcessingInstructionAllocator::XalanSourceTreeProcessingInstructionAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -107,3 +111,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstructionAllocator.hpp
Index: XalanSourceTreeProcessingInstructionAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeProcessingInstructionAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeProcessingInstructionAllocator.hpp 1 Nov 2001 15:51:14
-0000 1.2
+++ XalanSourceTreeProcessingInstructionAllocator.hpp 22 Nov 2002 02:18:32
-0000 1.3
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT
XalanSourceTreeProcessingInstructionAllocator
{
public:
@@ -161,6 +165,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +12 -4 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.cpp
Index: XalanSourceTreeText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanSourceTreeText.cpp 5 Sep 2002 07:10:31 -0000 1.11
+++ XalanSourceTreeText.cpp 22 Nov 2002 02:18:32 -0000 1.12
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -514,11 +518,11 @@
-static XalanDOMString s_nameString;
+static XalanDOMString s_staticNameString;
-const XalanDOMString& XalanSourceTreeText::s_nameString =
::s_nameString;
+const XalanDOMString& XalanSourceTreeText::s_nameString =
s_staticNameString;
@@ -537,7 +541,7 @@
void
XalanSourceTreeText::initialize()
{
- ::s_nameString = s_text;
+ s_staticNameString = s_text;
}
@@ -545,5 +549,9 @@
void
XalanSourceTreeText::terminate()
{
- releaseMemory(::s_nameString);
+ releaseMemory(s_staticNameString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.hpp
Index: XalanSourceTreeText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeText.hpp 6 Nov 2002 23:35:09 -0000 1.5
+++ XalanSourceTreeText.hpp 22 Nov 2002 02:18:32 -0000 1.6
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeComment;
class XalanSourceTreeDocumentFragment;
class XalanSourceTreeElement;
@@ -685,6 +689,10 @@
static const XalanDOMString& s_nameString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextAllocator.cpp
Index: XalanSourceTreeTextAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextAllocator.cpp 1 Nov 2001 15:51:14 -0000 1.2
+++ XalanSourceTreeTextAllocator.cpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeTextAllocator::XalanSourceTreeTextAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -103,3 +107,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextAllocator.hpp
Index: XalanSourceTreeTextAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextAllocator.hpp 1 Nov 2001 15:51:14 -0000 1.2
+++ XalanSourceTreeTextAllocator.hpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeTextAllocator
{
public:
@@ -157,6 +161,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWS.cpp
Index: XalanSourceTreeTextIWS.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWS.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextIWS.cpp 1 Nov 2001 15:51:14 -0000 1.2
+++ XalanSourceTreeTextIWS.cpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeTextIWS::XalanSourceTreeTextIWS(
const XalanDOMString& theData,
XalanNode* theParentNode,
@@ -90,3 +94,7 @@
{
return true;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWS.hpp
Index: XalanSourceTreeTextIWS.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWS.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextIWS.hpp 1 Nov 2001 15:51:14 -0000 1.2
+++ XalanSourceTreeTextIWS.hpp 22 Nov 2002 02:18:32 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeTextIWS : public
XalanSourceTreeText
{
public:
@@ -111,6 +115,10 @@
// Data members...
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWSAllocator.cpp
Index: XalanSourceTreeTextIWSAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWSAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextIWSAllocator.cpp 1 Nov 2001 15:51:14 -0000
1.2
+++ XalanSourceTreeTextIWSAllocator.cpp 22 Nov 2002 02:18:32 -0000
1.3
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeTextIWSAllocator::XalanSourceTreeTextIWSAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -103,3 +107,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWSAllocator.hpp
Index: XalanSourceTreeTextIWSAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeTextIWSAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeTextIWSAllocator.hpp 1 Nov 2001 15:51:14 -0000
1.2
+++ XalanSourceTreeTextIWSAllocator.hpp 22 Nov 2002 02:18:32 -0000
1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeTextIWSAllocator
{
public:
@@ -157,6 +161,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
