neilg 2003/09/10 07:56:31
Modified: c/src/xercesc/util RefArrayVectorOf.c RefArrayVectorOf.hpp
RefVectorOf.c
Log:
fix compiler warnings on ISeries; add Apache copyright notice
Revision Changes Path
1.8 +86 -31 xml-xerces/c/src/xercesc/util/RefArrayVectorOf.c
Index: RefArrayVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefArrayVectorOf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RefArrayVectorOf.c 30 May 2003 16:11:45 -0000 1.7
+++ RefArrayVectorOf.c 10 Sep 2003 14:56:31 -0000 1.8
@@ -1,3 +1,58 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
// ---------------------------------------------------------------------------
// Includes
@@ -22,85 +77,85 @@
template <class TElem> RefArrayVectorOf<TElem>::~RefArrayVectorOf()
{
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
+ if (this->fAdoptedElems)
{
- for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount;
index++)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);//delete[]
fElemList[index];
+ for (unsigned int index = 0; index < this->fCurCount; index++)
+ this->fMemoryManager->deallocate(this->fElemList[index]);//delete[]
fElemList[index];
}
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList);//delete
[] fElemList;
+ this->fMemoryManager->deallocate(this->fElemList);//delete [] fElemList;
}
template <class TElem> void
RefArrayVectorOf<TElem>::setElementAt(TElem* const toSet, const unsigned int setAt)
{
- if (setAt >= BaseRefVectorOf<TElem>::fCurCount)
+ if (setAt >= this->fCurCount)
ThrowXML(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex);
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[setAt]);
+ if (this->fAdoptedElems)
+ this->fMemoryManager->deallocate(this->fElemList[setAt]);
- BaseRefVectorOf<TElem>::fElemList[setAt] = toSet;
+ this->fElemList[setAt] = toSet;
}
template <class TElem> void RefArrayVectorOf<TElem>::removeAllElements()
{
- for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount; index++)
+ for (unsigned int index = 0; index < this->fCurCount; index++)
{
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);
+ if (this->fAdoptedElems)
+ this->fMemoryManager->deallocate(this->fElemList[index]);
// Keep unused elements zero for sanity's sake
- BaseRefVectorOf<TElem>::fElemList[index] = 0;
+ this->fElemList[index] = 0;
}
- BaseRefVectorOf<TElem>::fCurCount = 0;
+ this->fCurCount = 0;
}
template <class TElem> void RefArrayVectorOf<TElem>::
removeElementAt(const unsigned int removeAt)
{
- if (removeAt >= BaseRefVectorOf<TElem>::fCurCount)
+ if (removeAt >= this->fCurCount)
ThrowXML(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex);
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[removeAt]);
+ if (this->fAdoptedElems)
+ this->fMemoryManager->deallocate(this->fElemList[removeAt]);
// Optimize if its the last element
- if (removeAt == BaseRefVectorOf<TElem>::fCurCount-1)
+ if (removeAt == this->fCurCount-1)
{
- BaseRefVectorOf<TElem>::fElemList[removeAt] = 0;
- BaseRefVectorOf<TElem>::fCurCount--;
+ this->fElemList[removeAt] = 0;
+ this->fCurCount--;
return;
}
// Copy down every element above remove point
- for (unsigned int index = removeAt; index <
BaseRefVectorOf<TElem>::fCurCount-1; index++)
- BaseRefVectorOf<TElem>::fElemList[index] =
BaseRefVectorOf<TElem>::fElemList[index+1];
+ for (unsigned int index = removeAt; index < this->fCurCount-1; index++)
+ this->fElemList[index] = this->fElemList[index+1];
// Keep unused elements zero for sanity's sake
- BaseRefVectorOf<TElem>::fElemList[BaseRefVectorOf<TElem>::fCurCount-1] = 0;
+ this->fElemList[this->fCurCount-1] = 0;
// And bump down count
- BaseRefVectorOf<TElem>::fCurCount--;
+ this->fCurCount--;
}
template <class TElem> void RefArrayVectorOf<TElem>::removeLastElement()
{
- if (!BaseRefVectorOf<TElem>::fCurCount)
+ if (!this->fCurCount)
return;
- BaseRefVectorOf<TElem>::fCurCount--;
+ this->fCurCount--;
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[BaseRefVectorOf<TElem>::fCurCount]);
+ if (this->fAdoptedElems)
+ this->fMemoryManager->deallocate(this->fElemList[this->fCurCount]);
}
template <class TElem> void RefArrayVectorOf<TElem>::cleanup()
{
- if (BaseRefVectorOf<TElem>::fAdoptedElems)
+ if (this->fAdoptedElems)
{
- for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount;
index++)
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);
+ for (unsigned int index = 0; index < this->fCurCount; index++)
+ this->fMemoryManager->deallocate(this->fElemList[index]);
}
-
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList);//delete
[] fElemList;
+ this->fMemoryManager->deallocate(this->fElemList);//delete [] fElemList;
}
XERCES_CPP_NAMESPACE_END
1.4 +56 -0 xml-xerces/c/src/xercesc/util/RefArrayVectorOf.hpp
Index: RefArrayVectorOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefArrayVectorOf.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RefArrayVectorOf.hpp 27 May 2003 16:52:16 -0000 1.3
+++ RefArrayVectorOf.hpp 10 Sep 2003 14:56:31 -0000 1.4
@@ -1,3 +1,59 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
#if !defined(REFARRAYVECTOROF_HPP)
#define REFARRAYVECTOROF_HPP
1.11 +4 -1 xml-xerces/c/src/xercesc/util/RefVectorOf.c
Index: RefVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefVectorOf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RefVectorOf.c 30 May 2003 16:11:45 -0000 1.10
+++ RefVectorOf.c 10 Sep 2003 14:56:31 -0000 1.11
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.11 2003/09/10 14:56:31 neilg
+ * fix compiler warnings on ISeries; add Apache copyright notice
+ *
* Revision 1.10 2003/05/30 16:11:45 gareth
* Fixes so we compile under VC7.1. Patch by Alberto Massari.
*
@@ -139,7 +142,7 @@
for (unsigned int index = 0; index < this->fCurCount; index++)
delete this->fElemList[index];
}
- BaseRefVectorOf<TElem>::fMemoryManager->deallocate(this->fElemList);//delete
[] this->fElemList;
+ this->fMemoryManager->deallocate(this->fElemList);//delete [] this->fElemList;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
