You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/01/07 16:28:49 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema SchemaElementDecl.cpp
amassari 2005/01/07 07:28:49
Modified: c/src/xercesc/validators/datatype
AbstractNumericFacetValidator.cpp
AbstractStringValidator.cpp
c/src/xercesc/validators/common CMStateSet.hpp
ContentLeafNameTypeVector.cpp ContentSpecNode.cpp
c/src/xercesc/validators/DTD DTDScanner.cpp
c/src/xercesc/validators/schema/identity FieldActivator.cpp
FieldValueMap.cpp XercesXPath.cpp
c/src/xercesc/validators/schema SchemaElementDecl.cpp
Log:
Removed warnings
Revision Changes Path
1.21 +5 -3 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
Index: AbstractNumericFacetValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractNumericFacetValidator.cpp 8 Sep 2004 13:56:52 -0000 1.20
+++ AbstractNumericFacetValidator.cpp 7 Jan 2005 15:28:49 -0000 1.21
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.21 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.20 2004/09/08 13:56:52 peiyongz
* Apache License Version 2.0
*
@@ -224,7 +227,6 @@
return;
XMLCh* key;
- XMLCh* value;
RefHashTableOfEnumerator<KVStringPair> e(facets, false, manager);
@@ -232,7 +234,7 @@
{
KVStringPair pair = e.nextElement();
key = pair.getKey();
- value = pair.getValue();
+ XMLCh* value = pair.getValue();
if (XMLString::equals(key, SchemaSymbols::fgELT_PATTERN))
{
1.24 +4 -2 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractStringValidator.cpp 8 Sep 2004 13:56:52 -0000 1.23
+++ AbstractStringValidator.cpp 7 Jan 2005 15:28:49 -0000 1.24
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.24 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.23 2004/09/08 13:56:52 peiyongz
* Apache License Version 2.0
*
@@ -216,14 +219,13 @@
return;
XMLCh* key;
- XMLCh* value;
RefHashTableOfEnumerator<KVStringPair> e(facets, false, manager);
while (e.hasMoreElements())
{
KVStringPair pair = e.nextElement();
key = pair.getKey();
- value = pair.getValue();
+ XMLCh* value = pair.getValue();
if (XMLString::equals(key, SchemaSymbols::fgELT_LENGTH))
{
1.8 +5 -1 xml-xerces/c/src/xercesc/validators/common/CMStateSet.hpp
Index: CMStateSet.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMStateSet.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CMStateSet.hpp 8 Sep 2004 13:56:51 -0000 1.7
+++ CMStateSet.hpp 7 Jan 2005 15:28:49 -0000 1.8
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.8 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.7 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -130,7 +133,8 @@
*/
CMStateSet(const CMStateSet& toCopy) :
- fBitCount(toCopy.fBitCount)
+ XMemory(toCopy)
+ , fBitCount(toCopy.fBitCount)
, fByteArray(0)
, fMemoryManager(toCopy.fMemoryManager)
{
1.6 +5 -1 xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp
Index: ContentLeafNameTypeVector.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContentLeafNameTypeVector.cpp 8 Sep 2004 13:56:51 -0000 1.5
+++ ContentLeafNameTypeVector.cpp 7 Jan 2005 15:28:49 -0000 1.6
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.6 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.5 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -86,7 +89,8 @@
(
const ContentLeafNameTypeVector& toCopy
)
-: fMemoryManager(toCopy.fMemoryManager)
+: XMemory(toCopy)
+, fMemoryManager(toCopy.fMemoryManager)
, fLeafNames(0)
, fLeafTypes(0)
, fLeafCount(0)
1.14 +4 -2 xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp
Index: ContentSpecNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContentSpecNode.cpp 8 Sep 2004 13:56:51 -0000 1.13
+++ ContentSpecNode.cpp 7 Jan 2005 15:28:49 -0000 1.14
@@ -37,7 +37,9 @@
// ---------------------------------------------------------------------------
ContentSpecNode::ContentSpecNode(const ContentSpecNode& toCopy) :
- fMemoryManager(toCopy.fMemoryManager)
+ XSerializable(toCopy)
+ , XMemory(toCopy)
+ , fMemoryManager(toCopy.fMemoryManager)
, fElement(0)
, fElementDecl(toCopy.fElementDecl)
, fFirst(0)
1.37 +5 -2 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp
Index: DTDScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DTDScanner.cpp 14 Dec 2004 02:06:40 -0000 1.36
+++ DTDScanner.cpp 7 Jan 2005 15:28:49 -0000 1.37
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.37 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.36 2004/12/14 02:06:40 cargilld
* More error message updates.
*
@@ -304,12 +307,12 @@
, fInternalSubset(false)
, fNextAttrId(1)
, fDTDGrammar(dtdGrammar)
- , fPEntityDeclPool(0)
- , fDocTypeReaderId(0)
, fBufMgr(0)
, fReaderMgr(0)
, fScanner(0)
+ , fPEntityDeclPool(0)
, fEmptyNamespaceId(0)
+ , fDocTypeReaderId(0)
{
fPEntityDeclPool = new (fMemoryManager) NameIdPool<DTDEntityDecl>(109, 128, fMemoryManager);
}
1.10 +5 -1 xml-xerces/c/src/xercesc/validators/schema/identity/FieldActivator.cpp
Index: FieldActivator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/FieldActivator.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FieldActivator.cpp 8 Sep 2004 13:56:59 -0000 1.9
+++ FieldActivator.cpp 7 Jan 2005 15:28:49 -0000 1.10
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.10 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.9 2004/09/08 13:56:59 peiyongz
* Apache License Version 2.0
*
@@ -74,7 +77,8 @@
}
FieldActivator::FieldActivator(const FieldActivator& other)
- : fValueStoreCache(other.fValueStoreCache)
+ : XMemory(other)
+ , fValueStoreCache(other.fValueStoreCache)
, fMatcherStack(other.fMatcherStack)
, fMayMatch(0)
, fMemoryManager(other.fMemoryManager)
1.9 +5 -1 xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.cpp
Index: FieldValueMap.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FieldValueMap.cpp 8 Sep 2004 13:56:59 -0000 1.8
+++ FieldValueMap.cpp 7 Jan 2005 15:28:49 -0000 1.9
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.9 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.8 2004/09/08 13:56:59 peiyongz
* Apache License Version 2.0
*
@@ -65,7 +68,8 @@
}
FieldValueMap::FieldValueMap(const FieldValueMap& other)
- : fFields(0)
+ : XMemory(other)
+ , fFields(0)
, fValidators(0)
, fValues(0)
, fMemoryManager(other.fMemoryManager)
1.16 +10 -3 xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp
Index: XercesXPath.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XercesXPath.cpp 28 Dec 2004 16:35:57 -0000 1.15
+++ XercesXPath.cpp 7 Jan 2005 15:28:49 -0000 1.16
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.16 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.15 2004/12/28 16:35:57 amassari
* Store fAxisType as an integer, not as a XMLCh (bug# 1177)
*
@@ -134,8 +137,10 @@
}
XercesNodeTest::XercesNodeTest(const XercesNodeTest& other)
- : fType(other.fType)
- , fName(new ((other.fName)->getMemoryManager())QName(*other.fName))
+ : XSerializable(other)
+ , XMemory(other)
+ , fType(other.fType)
+ , fName(new ((other.fName)->getMemoryManager()) QName(*other.fName))
{
}
@@ -206,7 +211,9 @@
}
XercesStep::XercesStep(const XercesStep& other)
- : fAxisType(other.fAxisType)
+ : XSerializable(other)
+ , XMemory(other)
+ , fAxisType(other.fAxisType)
, fNodeTest(0)
{
fNodeTest = new (other.fNodeTest->getName()->getMemoryManager()) XercesNodeTest(*(other.fNodeTest));
1.23 +6 -3 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp
Index: SchemaElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SchemaElementDecl.cpp 28 Oct 2004 20:21:06 -0000 1.22
+++ SchemaElementDecl.cpp 7 Jan 2005 15:28:49 -0000 1.23
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.23 2005/01/07 15:28:49 amassari
+ * Removed warnings
+ *
* Revision 1.22 2004/10/28 20:21:06 peiyongz
* Data member reshuffle
*
@@ -218,7 +221,8 @@
XMLElementDecl(manager)
, fModelType(type)
, fPSVIScope(PSVIDefs::SCP_ABSENT)
- , fDatatypeValidator(0)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
, fEnclosingScope(enclosingScope)
, fFinalSet(0)
, fBlockSet(0)
@@ -231,8 +235,7 @@
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
+ , fDatatypeValidator(0)
, fSeenValidation(false)
, fSeenNoValidation(false)
, fHadContent(false)
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org