You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/06/30 19:18:36 UTC
svn commit: r672824 [2/2] - in /xalan/c/trunk/src/xalanc: Include/
PlatformSupport/ XPath/ XSLT/ XercesParserLiaison/
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.hpp Mon Jun 30 10:18:34 2008
@@ -59,7 +59,9 @@
*
* @param theBlockSize The block size.
*/
- XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanElemAttributeAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount);
~XalanElemAttributeAllocator();
@@ -79,8 +81,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
/**
* Determine if an object is owned by the allocator...
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp Mon Jun 30 10:18:34 2008
@@ -25,7 +25,9 @@
-XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -43,8 +45,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp Mon Jun 30 10:18:34 2008
@@ -59,7 +59,9 @@
*
* @param theBlockSize The block size.
*/
- XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanElemAttributeSetAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount);
~XalanElemAttributeSetAllocator();
@@ -79,8 +81,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
/**
* Determine if an object is owned by the allocator...
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.cpp Mon Jun 30 10:18:34 2008
@@ -25,7 +25,9 @@
-XalanElemElementAllocator::XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanElemElementAllocator::XalanElemElementAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -43,8 +45,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.hpp Mon Jun 30 10:18:34 2008
@@ -59,7 +59,9 @@
*
* @param theBlockSize The block size.
*/
- XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanElemElementAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount);
~XalanElemElementAllocator();
@@ -79,8 +81,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
/**
* Determine if an object is owned by the allocator...
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp Mon Jun 30 10:18:34 2008
@@ -85,6 +85,12 @@
static ExceptionCode
translateErrorCode(DOMExceptionType::ExceptionCode theCode);
+
+ static ExceptionCode
+ translateErrorCode(short theCode)
+ {
+ return translateErrorCode(static_cast<DOMExceptionType::ExceptionCode>(theCode));
+ }
};
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp Mon Jun 30 10:18:34 2008
@@ -50,6 +50,7 @@
m_nodeMap(theMap),
m_lastIndex(theMap->getLength() - 1)
{
+ assert(theMap->getLength() != 0);
}
@@ -60,7 +61,7 @@
-unsigned int
+XalanSize_t
XercesNamedNodeMapAttributeList::getLength() const
{
return m_lastIndex + 1;
@@ -69,7 +70,7 @@
const XMLCh*
-XercesNamedNodeMapAttributeList::getName(const unsigned int index) const
+XercesNamedNodeMapAttributeList::getName(const XalanSize_t index) const
{
const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index);
assert(theAttribute != 0);
@@ -80,7 +81,7 @@
const XMLCh*
-XercesNamedNodeMapAttributeList::getType(const unsigned int /* index */) const
+XercesNamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const
{
assert(length(s_typeString) > 0);
@@ -90,7 +91,7 @@
const XMLCh*
-XercesNamedNodeMapAttributeList::getValue(const unsigned int index) const
+XercesNamedNodeMapAttributeList::getValue(const XalanSize_t index) const
{
const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index);
assert(theAttribute != 0);
@@ -128,7 +129,7 @@
const XMLCh*
XercesNamedNodeMapAttributeList::getValue(const char* const /*name*/) const
{
- assert( 0 );
+ assert(false);
return 0;
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp Mon Jun 30 10:18:34 2008
@@ -50,17 +50,17 @@
~XercesNamedNodeMapAttributeList();
// These are inherited from AttributeList
- virtual unsigned int
+ virtual XalanSize_t
getLength() const;
virtual const XMLCh*
- getName(const unsigned int index) const;
+ getName(const XalanSize_t index) const;
virtual const XMLCh*
- getType(const unsigned int index) const;
+ getType(const XalanSize_t index) const;
virtual const XMLCh*
- getValue(const unsigned int index) const;
+ getValue(const XalanSize_t index) const;
virtual const XMLCh*
getType(const XMLCh* const name) const;
@@ -83,7 +83,7 @@
// Data members...
const DOMNamedNodeMapType* const m_nodeMap;
- const XMLSizeType m_lastIndex;
+ const XalanSize_t m_lastIndex;
static const XMLCh s_typeString[];
};
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org