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/06/17 00:08:02 UTC
svn commit: r191014 - in /xerces/c/trunk:
Projects/Win32/VC6/xerces-all/XercesLib/ src/xercesc/framework/psvi/
src/xercesc/internal/ src/xercesc/validators/common/
src/xercesc/validators/schema/
Author: amassari
Date: Thu Jun 16 15:08:00 2005
New Revision: 191014
URL: http://svn.apache.org/viewcvs?rev=191014&view=rev
Log:
Fixed warnings with Visual C++ 6
Modified:
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp
xerces/c/trunk/src/xercesc/validators/common/Grammar.cpp
xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp
xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
xerces/c/trunk/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp Thu Jun 16 15:08:00 2005
@@ -170,7 +170,6 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp
-# ADD CPP /Ze
# End Source File
# Begin Source File
@@ -183,7 +182,6 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\Transcoders\Win32\Win32TransService.cpp
-# ADD CPP /Ze
# End Source File
# Begin Source File
@@ -196,7 +194,6 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\BinHTTPURLInputStream.cpp
-# ADD CPP /Ze
# End Source File
# Begin Source File
@@ -205,7 +202,6 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\WinSockNetAccessor.cpp
-# ADD CPP /Ze
# End Source File
# Begin Source File
@@ -575,10 +571,6 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\HashXMLCh.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\xercesc\util\HeaderDummy.cpp
# End Source File
# Begin Source File
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp Thu Jun 16 15:08:00 2005
@@ -15,62 +15,13 @@
*/
/*
- * $Log$
- * Revision 1.15 2004/09/08 13:56:07 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.14 2004/07/06 14:58:15 cargilld
- * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX system header which already uses VC_DEFAULT as a macro. Will need to document that this fix breaks source code compatibility.
- *
- * Revision 1.13 2004/05/04 19:02:40 cargilld
- * Enable IDs to work on all kinds of schema components
- *
- * Revision 1.12 2004/01/29 11:46:30 cargilld
- * Code cleanup changes to get rid of various compiler diagnostic messages.
- *
- * Revision 1.11 2004/01/06 03:55:26 knoaman
- * Various PSVI fixes.
- *
- * Revision 1.10 2003/12/30 20:41:06 neilg
- * do not report anything about default/fixed values for non-global attribute declarations
- *
- * Revision 1.9 2003/12/29 17:06:31 knoaman
- * PSVI: return value constraint only if global declaration
- *
- * Revision 1.8 2003/12/29 16:15:42 knoaman
- * More PSVI updates
- *
- * Revision 1.7 2003/11/21 22:34:45 neilg
- * More schema component model implementation, thanks to David Cargill.
- * In particular, this cleans up and completes the XSModel, XSNamespaceItem,
- * XSAttributeDeclaration and XSAttributeGroup implementations.
- *
- * Revision 1.6 2003/11/21 17:19:30 knoaman
- * PSVI update.
- *
- * Revision 1.5 2003/11/14 22:47:53 neilg
- * fix bogus log message from previous commit...
- *
- * Revision 1.4 2003/11/14 22:33:30 neilg
- * Second phase of schema component model implementation.
- * Implement XSModel, XSNamespaceItem, and the plumbing necessary
- * to connect them to the other components.
- * Thanks to David Cargill.
- *
- * Revision 1.3 2003/11/06 15:30:04 neilg
- * first part of PSVI/schema component model implementation, thanks to David Cargill. This covers setting the PSVIHandler on parser objects, as well as implementing XSNotation, XSSimpleTypeDefinition, XSIDCDefinition, and most of XSWildcard, XSComplexTypeDefinition, XSElementDeclaration, XSAttributeDeclaration and XSAttributeUse.
- *
- * Revision 1.2 2003/09/17 17:45:37 neilg
- * remove spurious inlines; hopefully this will make Solaris/AIX compilers happy.
- *
- * Revision 1.1 2003/09/16 14:33:36 neilg
- * PSVI/schema component model classes, with Makefile/configuration changes necessary to build them
- *
+ * $Id $
*/
#include <xercesc/framework/psvi/XSAttributeDeclaration.hpp>
#include <xercesc/framework/psvi/XSModel.hpp>
#include <xercesc/framework/psvi/XSNamespaceItem.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/util/StringPool.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp Thu Jun 16 15:08:00 2005
@@ -15,42 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.10 2004/09/08 13:56:07 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.9 2004/05/04 19:02:40 cargilld
- * Enable IDs to work on all kinds of schema components
- *
- * Revision 1.8 2003/12/24 17:42:02 knoaman
- * Misc. PSVI updates
- *
- * Revision 1.7 2003/12/01 23:23:26 neilg
- * fix for bug 25118; thanks to Jeroen Witmond
- *
- * Revision 1.6 2003/11/21 22:34:45 neilg
- * More schema component model implementation, thanks to David Cargill.
- * In particular, this cleans up and completes the XSModel, XSNamespaceItem,
- * XSAttributeDeclaration and XSAttributeGroup implementations.
- *
- * Revision 1.5 2003/11/21 17:19:30 knoaman
- * PSVI update.
- *
- * Revision 1.4 2003/11/14 22:47:53 neilg
- * fix bogus log message from previous commit...
- *
- * Revision 1.3 2003/11/14 22:33:30 neilg
- * Second phase of schema component model implementation.
- * Implement XSModel, XSNamespaceItem, and the plumbing necessary
- * to connect them to the other components.
- * Thanks to David Cargill.
- *
- * Revision 1.2 2003/11/06 15:30:04 neilg
- * first part of PSVI/schema component model implementation, thanks to David Cargill. This covers setting the PSVIHandler on parser objects, as well as implementing XSNotation, XSSimpleTypeDefinition, XSIDCDefinition, and most of XSWildcard, XSComplexTypeDefinition, XSElementDeclaration, XSAttributeDeclaration and XSAttributeUse.
- *
- * Revision 1.1 2003/09/16 14:33:36 neilg
- * PSVI/schema component model classes, with Makefile/configuration changes necessary to build them
- *
+ * $Id $
*/
#if !defined(XSATTRIBUTEDECLARATION_HPP)
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Thu Jun 16 15:08:00 2005
@@ -36,6 +36,7 @@
#include <xercesc/framework/XMLDTDDescription.hpp>
#include <xercesc/framework/psvi/PSVIHandler.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
@@ -43,6 +44,7 @@
#include <xercesc/validators/schema/SchemaValidator.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraintHandler.hpp>
#include <xercesc/validators/schema/identity/IC_Selector.hpp>
+#include <xercesc/validators/schema/identity/ValueStore.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp Thu Jun 16 15:08:00 2005
@@ -41,6 +41,7 @@
#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
#include <xercesc/framework/psvi/PSVIElement.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/DTD/DTDValidator.hpp>
@@ -53,6 +54,7 @@
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/schema/XSDDOMParser.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraintHandler.hpp>
+#include <xercesc/validators/schema/identity/ValueStore.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Thu Jun 16 15:08:00 2005
@@ -35,6 +35,7 @@
#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/framework/psvi/PSVIHandler.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
#include <xercesc/validators/schema/SchemaValidator.hpp>
@@ -44,6 +45,7 @@
#include <xercesc/validators/schema/XMLSchemaDescriptionImpl.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraintHandler.hpp>
#include <xercesc/validators/schema/identity/IC_Selector.hpp>
+#include <xercesc/validators/schema/identity/ValueStore.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
#include <xercesc/util/HashPtr.hpp>
Modified: xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp Thu Jun 16 15:08:00 2005
@@ -27,6 +27,7 @@
#include <xercesc/sax/InputSource.hpp>
#include <xercesc/framework/XMLEntityHandler.hpp>
#include <xercesc/framework/XMLDocumentHandler.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/schema/SchemaValidator.hpp>
Modified: xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp Thu Jun 16 15:08:00 2005
@@ -15,81 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.24 2005/01/06 21:39:43 amassari
- * Removed warnings
- *
- * Revision 1.23 2004/09/08 13:56:14 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.22 2004/07/06 14:58:15 cargilld
- * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX system header which already uses VC_DEFAULT as a macro. Will need to document that this fix breaks source code compatibility.
- *
- * Revision 1.21 2004/03/05 16:28:21 knoaman
- * PSVI: prohibited attributes should not be part of attribute use. Patch by Mike Boos.
- *
- * Revision 1.20 2004/02/05 18:09:53 cargilld
- * Fix a seg fault with PSVI and set basetype of anysimpletype to be anytype.
- *
- * Revision 1.19 2004/01/07 02:33:56 knoaman
- * PSVI: inherit facets from base type
- *
- * Revision 1.18 2004/01/06 15:24:42 neilg
- * make sure locally-declared attributes have declarations in the PSVI
- *
- * Revision 1.17 2004/01/06 03:55:26 knoaman
- * Various PSVI fixes.
- *
- * Revision 1.16 2003/12/30 19:46:15 neilg
- * use a null-terminated string when tokenizing pattern facets
- *
- * Revision 1.15 2003/12/29 16:45:06 knoaman
- * PSVI: add whitespace facet if missing
- *
- * Revision 1.14 2003/12/29 16:15:41 knoaman
- * More PSVI updates
- *
- * Revision 1.13 2003/12/24 17:42:02 knoaman
- * Misc. PSVI updates
- *
- * Revision 1.12 2003/12/17 20:50:35 knoaman
- * PSVI: fix for annotation of attributes in attributeGroup/derived types
- *
- * Revision 1.11 2003/12/17 19:58:25 knoaman
- * Check for NULL when building XSParticle
- *
- * Revision 1.10 2003/12/17 00:18:34 cargilld
- * Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
- *
- * Revision 1.9 2003/12/10 05:14:00 neilg
- * fix seg fault caused when a complex type had simple content; we were not processing the complex type itself, only its base
- *
- * Revision 1.8 2003/12/01 20:41:25 neilg
- * fix for infinite loop between XSComplexTypeDefinitions and XSElementDeclarations; from David Cargill
- *
- * Revision 1.7 2003/11/27 16:42:00 neilg
- * fixes for segfaults and infinite loops in schema component model implementation; thanks to David Cargill
- *
- * Revision 1.6 2003/11/25 17:50:15 knoaman
- * Fix AIX linking error
- *
- * Revision 1.5 2003/11/24 15:45:36 knoaman
- * PSVI: finish construction of XSSimpleTypeDefinition
- *
- * Revision 1.4 2003/11/23 16:49:26 knoaman
- * PSVI: create local elements of groups
- *
- * Revision 1.3 2003/11/23 16:21:40 knoaman
- * PSVI: create local elements of complex types
- *
- * Revision 1.2 2003/11/21 22:34:46 neilg
- * More schema component model implementation, thanks to David Cargill.
- * In particular, this cleans up and completes the XSModel, XSNamespaceItem,
- * XSAttributeDeclaration and XSAttributeGroup implementations.
- *
- * Revision 1.1 2003/11/21 17:11:24 knoaman
- * Initial revision
- *
+ * $Id $
*/
@@ -113,6 +39,7 @@
#include <xercesc/framework/psvi/XSNotationDeclaration.hpp>
#include <xercesc/framework/psvi/XSFacet.hpp>
#include <xercesc/framework/psvi/XSMultiValueFacet.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/validators/schema/SchemaAttDefList.hpp>
Modified: xerces/c/trunk/src/xercesc/validators/common/Grammar.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/common/Grammar.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/Grammar.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/Grammar.cpp Thu Jun 16 15:08:00 2005
@@ -16,19 +16,6 @@
/*
* $Id$
- * $Log$
- * Revision 1.4 2004/09/08 13:56:51 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.3 2004/01/29 11:51:21 cargilld
- * Code cleanup changes to get rid of various compiler diagnostic messages.
- *
- * Revision 1.2 2003/10/29 16:19:47 peiyongz
- * storeGrammar()/loadGrammar added
- *
- * Revision 1.1 2003/10/14 15:19:24 peiyongz
- * Implementation of Serialization/Deserialization
- *
*/
#include <xercesc/validators/common/Grammar.hpp>
@@ -39,6 +26,7 @@
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp Thu Jun 16 15:08:00 2005
@@ -15,126 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.32 2005/04/29 20:21:02 dbertoni
- * Patch for Jira issue XERCESC-1407.
- *
- * Revision 1.31 2005/03/20 14:53:35 knoaman
- * [jira 1381] Memory leak in GrammarResolver - patch by Christian Will.
- *
- * Revision 1.30 2004/12/03 17:00:13 amassari
- * Avoid throwing an exception when orphaning a cached grammar that has not been used yet
- *
- * Revision 1.29 2004/09/29 19:27:07 cargilld
- * Fix for Jira-1217: fixing problems with getXSModel.
- *
- * Revision 1.28 2004/09/08 13:56:51 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.27 2004/09/02 14:13:13 amassari
- * If getXSModel was invoked when schema caching was off and nothing had changed, a new (empty) model was created even if a non-empty one was already available
- *
- * Revision 1.26 2004/05/21 15:19:16 peiyongz
- * [jira1216] GrammarResolver never clears internal cache of
- * Grammar instances -- patch from David Bertoni
- *
- * Revision 1.25 2004/02/17 15:53:50 neilg
- * fix potential memory leak
- *
- * Revision 1.24 2004/01/06 18:52:15 knoaman
- * Reset list of grammars after building XSModel
- *
- * Revision 1.23 2003/12/31 02:36:03 neilg
- * Even if the resolver has no grammars, since all schema
- * processors are aware of the schema-for-schemas, an XSModel
- * should be produced.
- *
- * Revision 1.22 2003/12/17 00:18:38 cargilld
- * Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
- *
- * Revision 1.21 2003/11/21 22:38:50 neilg
- * Enable grammar pools and grammar resolvers to manufacture
- * XSModels. This also cleans up handling in the
- * parser classes by eliminating the need to tell
- * the grammar pool that schema compoments need to be produced.
- * Thanks to David Cargill.
- *
- * Revision 1.20 2003/11/06 21:53:52 neilg
- * update grammar pool interface so that cacheGrammar(Grammar) can tell the caller whether the grammar was accepted. Also fix some documentation errors.
- *
- * Revision 1.19 2003/09/16 18:30:54 neilg
- * make Grammar pool be responsible for creating and owning URI string pools. This is one more step towards having grammars be independent of the parsers involved in their creation
- *
- * Revision 1.18 2003/09/02 09:04:44 gareth
- * added API to get enumerator to referenced grammars.
- *
- * Revision 1.17 2003/09/01 12:59:59 gareth
- * added API to get an enumerator for the cached grammars.
- *
- * Revision 1.16 2003/08/22 09:04:41 gareth
- * keep the fGrammarFromPool in sync to avoid problems when parseing multiple times. Patch by Alberto Massari.
- *
- * Revision 1.15 2003/07/31 17:08:39 peiyongz
- * Grammar embed grammar description
- * fGrammarFromPool introduced
- *
- * Revision 1.14 2003/06/25 22:38:40 peiyongz
- * remove old getGrammar()
- *
- * Revision 1.13 2003/06/25 19:32:05 peiyongz
- * remove old putGrammar()
- *
- * Revision 1.12 2003/06/25 18:57:56 peiyongz
- * remove old orphanGrammar()
- *
- * Revision 1.11 2003/06/25 17:44:04 peiyongz
- * cacheGrammar() revised
- *
- * Revision 1.10 2003/06/23 15:53:50 peiyongz
- * clean up temporary XMLGrammarDescription to make MemoryTest happy
- *
- * Revision 1.9 2003/06/20 18:58:45 peiyongz
- * Stateless Grammar Pool :: Part I
- *
- * Revision 1.8 2003/05/18 14:02:06 knoaman
- * Memory manager implementation: pass per instance manager.
- *
- * Revision 1.7 2003/05/16 21:43:20 knoaman
- * Memory manager implementation: Modify constructors to pass in the memory manager.
- *
- * Revision 1.6 2003/05/15 18:48:27 knoaman
- * Partial implementation of the configurable memory manager.
- *
- * Revision 1.5 2002/11/04 14:54:58 tng
- * C++ Namespace Support.
- *
- * Revision 1.4 2002/09/24 19:48:39 tng
- * Performance: use XMLString::equals instead of XMLString::compareString
- *
- * Revision 1.3 2002/07/12 14:35:37 knoaman
- * Add an error message and use it in the scanner.
- *
- * Revision 1.2 2002/07/11 18:17:43 knoaman
- * Grammar caching/preparsing - initial implementation.
- *
- * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
- * sane_include
- *
- * Revision 1.5 2001/08/28 19:20:54 tng
- * Schema: xsi:type support
- *
- * Revision 1.4 2001/07/24 18:33:13 knoaman
- * Added support for <group> + extra constraint checking for complexType
- *
- * Revision 1.3 2001/06/07 20:58:39 tng
- * Fix no newline at the end warning. By Pei Yong Zhang.
- *
- * Revision 1.2 2001/05/11 13:27:19 tng
- * Copyright update.
- *
- * Revision 1.1 2001/03/21 21:56:28 tng
- * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
- *
+ * $Id $
*/
#include <xercesc/validators/common/GrammarResolver.hpp>
@@ -143,6 +24,7 @@
#include <xercesc/validators/schema/XMLSchemaDescriptionImpl.hpp>
#include <xercesc/validators/DTD/XMLDTDDescriptionImpl.hpp>
#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp Thu Jun 16 15:08:00 2005
@@ -15,140 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.27 2005/03/17 08:22:29 amassari
- * Fully qualify enum (jira# 1383)
- *
- * Revision 1.26 2004/11/18 16:20:06 cargilld
- * Changes for linker problems with linux build using xlc.
- *
- * Revision 1.25 2004/10/20 15:19:07 knoaman
- * Allow option of initializing static data in XMLPlatformUtils::Initialize
- *
- * Revision 1.24 2004/09/30 13:14:28 amassari
- * Fix jira#1280 - Borland leaks memory if break or continue are used inside a catch block
- *
- * Revision 1.23 2004/09/29 20:58:10 knoaman
- * [Bug 1209] Problem with id usage across schema
- * http://issues.apache.org/jira/browse/XERCESC-1209
- *
- * Revision 1.22 2004/09/08 13:56:56 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.21 2004/01/29 11:52:31 cargilld
- * Code cleanup changes to get rid of various compiler diagnostic messages.
- *
- * Revision 1.20 2004/01/13 16:17:09 knoaman
- * Fo sanity, use class name to qualify method
- *
- * Revision 1.19 2004/01/09 22:41:58 knoaman
- * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
- *
- * Revision 1.18 2003/12/17 00:18:40 cargilld
- * Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
- *
- * Revision 1.17 2003/12/11 19:26:27 knoaman
- * Store non schema attributes from parent in XSAnnotation
- *
- * Revision 1.16 2003/11/12 20:35:31 peiyongz
- * Stateless Grammar: ValidationContext
- *
- * Revision 1.15 2003/10/20 15:57:22 knoaman
- * Fix multithreading problem.
- *
- * Revision 1.14 2003/10/01 16:32:41 neilg
- * improve handling of out of memory conditions, bug #23415. Thanks to David Cargill.
- *
- * Revision 1.13 2003/05/15 18:57:27 knoaman
- * Partial implementation of the configurable memory manager.
- *
- * Revision 1.12 2003/01/17 15:35:57 knoaman
- * Fix for attribute checking of schema declarations.
- *
- * Revision 1.11 2003/01/15 18:33:11 knoaman
- * Make sure that the namespace of schema declarations is the schema namespace.
- *
- * Revision 1.10 2002/12/10 16:58:22 knoaman
- * Schema Errata E1-16.
- *
- * Revision 1.9 2002/11/04 14:49:41 tng
- * C++ Namespace Support.
- *
- * Revision 1.8 2002/09/27 13:22:52 tng
- * [Bug 13073] GeneralAttributeCheck.cpp : compilation fails with Sun C++ 4.2 on Solaris2.7 system.
- *
- * Revision 1.7 2002/09/26 21:08:14 tng
- * [Bug12849] comparison is always false warning. Patch from Gareth Reakes
- *
- * Revision 1.6 2002/09/24 20:18:14 tng
- * Performance: use XMLString::equals instead of XMLString::compareString
- * and check for null string directly isntead of calling XMLString::stringLen
- *
- * Revision 1.5 2002/05/27 19:54:33 knoaman
- * Performance: use pre-built element-attribute map table.
- *
- * Revision 1.4 2002/05/21 19:30:10 tng
- * DOM Reorganization: modify to use the new DOM interface.
- *
- * Revision 1.3 2002/03/21 15:34:40 knoaman
- * Add support for reporting line/column numbers of schema errors.
- *
- * Revision 1.2 2002/02/06 22:21:49 knoaman
- * Use IDOM for schema processing.
- *
- * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
- * sane_include
- *
- * Revision 1.16 2002/01/02 19:50:34 knoaman
- * Fix for error message when checking for attributes with a namespace prefix.
- *
- * Revision 1.15 2001/12/13 18:08:39 knoaman
- * Fix for bug 5410.
- *
- * Revision 1.14 2001/11/19 18:26:31 knoaman
- * no message
- *
- * Revision 1.13 2001/11/19 17:37:55 knoaman
- * Use the instance of ID datatye validator directly.
- *
- * Revision 1.12 2001/11/16 15:03:37 knoaman
- * Design change: GeneralAttributeCheck is not longer a singleton class.
- *
- * Revision 1.11 2001/11/02 14:13:45 knoaman
- * Add support for identity constraints.
- *
- * Revision 1.10 2001/10/25 15:07:46 tng
- * Thread safe the static instance.
- *
- * Revision 1.9 2001/10/23 23:14:55 peiyongz
- * [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
- *
- * Revision 1.8 2001/10/16 17:01:58 knoaman
- * Extra constraint checking.
- *
- * Revision 1.7 2001/10/15 19:29:26 knoaman
- * Add support for <notation> declaration.
- *
- * Revision 1.6 2001/09/18 14:41:56 knoaman
- * Add support for <annotation>.
- *
- * Revision 1.5 2001/08/27 20:14:42 knoaman
- * Validate attributes in <all>, <redefine>, <group> and <attributeGroup> declarations.
- * Misc. fixes.
- *
- * Revision 1.4 2001/06/06 13:09:02 knoaman
- * Use BooleanDatatypeValidator to validate values.
- *
- * Revision 1.3 2001/05/18 20:05:30 knoaman
- * Modified wording of error messages.
- *
- * Revision 1.2 2001/05/17 18:11:15 knoaman
- * More constraint and attribute checking.
- *
- * Revision 1.1 2001/05/15 21:59:31 knoaman
- * TraverseSchema: add attribute checking + some fixes + more error messages.
- * More attribute cheking to come.
- *
+ * $Id $
*/
// ---------------------------------------------------------------------------
@@ -156,16 +23,17 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/GeneralAttributeCheck.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+#include <xercesc/validators/schema/TraverseSchema.hpp>
+#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
+#include <xercesc/dom/DOMNamedNodeMap.hpp>
+#include <xercesc/framework/XMLErrorCodes.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
-#include <xercesc/dom/DOMNamedNodeMap.hpp>
-#include <xercesc/framework/XMLErrorCodes.hpp>
-#include <xercesc/validators/schema/TraverseSchema.hpp>
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
#include <xercesc/util/XMLInitializer.hpp>
-#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Thu Jun 16 15:08:00 2005
@@ -15,270 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.60 2005/04/26 17:51:01 cargilld
- * Schema updates to match spec: both the default value and the canonical representation of that value have to fit the pattern and it is an error for NOTATION to be used directly in a schema.
- *
- * Revision 1.59 2004/11/25 15:16:04 knoaman
- * PSVI: fix for getIsSchemaSpecified on empty elements with default values.
- *
- * Revision 1.58 2004/09/30 13:14:28 amassari
- * Fix jira#1280 - Borland leaks memory if break or continue are used inside a catch block
- *
- * Revision 1.57 2004/09/27 20:13:59 knoaman
- * Reset datatype validator.
- *
- * Revision 1.56 2004/09/20 15:00:50 amassari
- * Added a setCreateSchemaInfo method to the DOM parsers, to store PSVI informations in element and attribute nodes
- *
- * Revision 1.55 2004/09/08 13:56:57 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.54 2004/07/27 02:09:41 amassari
- * reset() was not resetting the stack of types (jira#1245)
- *
- * Revision 1.53 2004/03/01 21:06:38 knoaman
- * Fix for UPA checking
- *
- * Revision 1.52 2004/01/29 11:52:31 cargilld
- * Code cleanup changes to get rid of various compiler diagnostic messages.
- *
- * Revision 1.51 2003/12/30 06:01:20 neilg
- * fix segfault when validation of a union type fails
- *
- * Revision 1.50 2003/12/24 15:24:16 cargilld
- * More updates to memory management so that the static memory manager.
- *
- * Revision 1.49 2003/12/17 05:16:59 neilg
- * ensure all uses of ArrayJanitor use a memory manager
- *
- * Revision 1.48 2003/12/17 00:18:40 cargilld
- * Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
- *
- * Revision 1.47 2003/12/03 20:00:27 neilg
- * PSVI fix: cannot allow validator to reset its element content buffer before exposing it to the application
- *
- * Revision 1.46 2003/11/27 22:52:37 knoaman
- * PSVIElement implementation
- *
- * Revision 1.45 2003/11/27 06:10:31 neilg
- * PSVIAttribute implementation
- *
- * Revision 1.44 2003/11/24 05:13:20 neilg
- * expose validator that actually validated attribute. Clean up union handling
- *
- * Revision 1.43 2003/11/20 18:12:20 knoaman
- * Use a bitwise operation to check the node type.
- *
- * Revision 1.42 2003/11/12 20:35:31 peiyongz
- * Stateless Grammar: ValidationContext
- *
- * Revision 1.41 2003/11/10 21:56:54 neilg
- * make internal code use the new, stateless, method of traversing attribute lists
- *
- * Revision 1.40 2003/11/07 17:08:12 knoaman
- * For PSVI support, distinguish wildcard elements with namespace lists.
- *
- * Revision 1.39 2003/10/05 02:09:37 neilg
- * the validator now keeps track of the current complex and simple type (including if this is an xsi:type). This allows both the validator and the scanner to know what the current type is, without the need to modify the element declaration each time an xsi:type is seen
- *
- * Revision 1.38 2003/10/01 16:32:42 neilg
- * improve handling of out of memory conditions, bug #23415. Thanks to David Cargill.
- *
- * Revision 1.37 2003/10/01 01:09:35 knoaman
- * Refactoring of some code to improve performance.
- *
- * Revision 1.36 2003/08/14 03:01:04 knoaman
- * Code refactoring to improve performance of validation.
- *
- * Revision 1.35 2003/07/31 17:14:27 peiyongz
- * Grammar embed grammar description
- *
- * Revision 1.34 2003/06/25 22:38:18 peiyongz
- * to use new GrammarResolver::getGrammar()
- *
- * Revision 1.33 2003/06/20 19:03:03 peiyongz
- * Stateless Grammar Pool :: Part I
- *
- * Revision 1.32 2003/05/18 14:02:08 knoaman
- * Memory manager implementation: pass per instance manager.
- *
- * Revision 1.31 2003/05/16 21:43:21 knoaman
- * Memory manager implementation: Modify constructors to pass in the memory manager.
- *
- * Revision 1.30 2003/05/16 03:15:51 knoaman
- * Partial implementation of the configurable memory manager.
- *
- * Revision 1.29 2003/05/15 18:57:27 knoaman
- * Partial implementation of the configurable memory manager.
- *
- * Revision 1.28 2003/02/06 13:51:55 gareth
- * fixed bug with multiple attributes being validated by the same union type.
- *
- * Revision 1.27 2003/01/29 20:01:20 gareth
- * We now detect when elements/attributes are validated and the result of the validation is stored.
- *
- * Revision 1.26 2003/01/20 19:04:48 knoaman
- * Fix for particle derivation checking.
- *
- * Revision 1.25 2003/01/13 20:16:51 knoaman
- * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
- *
- * Revision 1.24 2002/12/20 22:10:47 tng
- * XML 1.1
- *
- * Revision 1.23 2002/12/12 20:53:28 knoaman
- * Schema Errata E1-15.
- *
- * Revision 1.22 2002/12/04 02:47:26 knoaman
- * scanner re-organization.
- *
- * Revision 1.21 2002/11/27 22:15:42 peiyongz
- * Schema Errat E2-24 Duration 'T': allow to catch SchemaDateTimeException
- *
- * Revision 1.20 2002/11/27 21:27:14 peiyongz
- * Schema Errat E2-24 Duration 'T': allow to catch SchemaDateTimeException
- *
- * Revision 1.19 2002/11/26 21:20:09 tng
- * Schema Fix: List can have Union, and Union can have List. So need to check its items for ID/IDREF/Entity.
- *
- * Revision 1.18 2002/11/07 21:57:37 tng
- * Fix the following Schema Test Failures:
- * 1. Typo when comparing miscFlags with FIXED
- * 2. If xsi:type is specified, need to validate using that xsitype validator even if the type was any
- * 3. Need to check ID/IDREFs for element value
- * 4. Need to duplicate attribute id for wildcard scenario.
- *
- * Revision 1.17 2002/11/04 14:49:42 tng
- * C++ Namespace Support.
- *
- * Revision 1.16 2002/09/24 20:12:48 tng
- * Performance: use XMLString::equals instead of XMLString::compareString
- *
- * Revision 1.15 2002/09/16 20:37:08 tng
- * Infinite loop for malformed xml (e.g. simple has "XXXX") w/ setexitonfirstfatal(false).
- *
- * Revision 1.14 2002/09/04 18:17:41 tng
- * Do not set IDREF to used during prevalidation.
- *
- * Revision 1.13 2002/07/11 18:55:44 knoaman
- * Add a flag to the preContentValidation method to indicate whether to validate
- * default/fixed attributes or not.
- *
- * Revision 1.12 2002/06/17 18:53:58 tng
- * DOM L3: support "datatype-normalization"
- *
- * Revision 1.11 2002/06/17 18:09:29 tng
- * DOM L3: support "datatype-normalization"
- *
- * Revision 1.10 2002/05/23 21:27:21 knoaman
- * Fix "Array Bound Read" problem reported by Purify.
- *
- * Revision 1.9 2002/04/19 13:33:23 knoaman
- * Fix for bug 8236.
- *
- * Revision 1.8 2002/04/01 20:17:55 peiyongz
- * Bug#7551: Exceptions are caught by value, rather than by reference
- *
- * Revision 1.7 2002/04/01 15:47:06 knoaman
- * Move Element Consistency checking (ref to global declarations) to SchemaValidator.
- *
- * Revision 1.6 2002/03/25 20:25:32 knoaman
- * Move particle derivation checking from TraverseSchema to SchemaValidator.
- *
- * Revision 1.5 2002/02/26 14:26:10 tng
- * [Bug 6672] SAXValidator results in an access violation when validating against schema with empty element that has default value.
- *
- * Revision 1.4 2002/02/25 21:24:31 tng
- * Schema Fix: Ensure no invalid uri index for UPA checking.
- *
- * Revision 1.3 2002/02/25 21:18:18 tng
- * Schema Fix: Ensure no invalid uri index for UPA checking.
- *
- * Revision 1.2 2002/02/07 16:41:29 knoaman
- * Fix for xsi:type.
- *
- * Revision 1.1.1.1 2002/02/01 22:22:47 peiyongz
- * sane_include
- *
- * Revision 1.26 2001/11/21 18:05:09 tng
- * Schema Fix: Check both XMLAttDef::Fixed and XMLAttDef::Required_And_Fixed for default values.
- *
- * Revision 1.25 2001/11/21 14:30:13 knoaman
- * Fix for UPA checking.
- *
- * Revision 1.24 2001/11/20 20:32:52 knoaman
- * Bypass validating element's simple content if it's empty and element is nillable.
- *
- * Revision 1.23 2001/11/13 13:25:08 tng
- * Deprecate function XMLValidator::checkRootElement.
- *
- * Revision 1.22 2001/11/09 18:10:58 tng
- * Schema Fix: should concatenate all characters for validation.
- *
- * Revision 1.21 2001/10/23 13:35:36 tng
- * Schema fix: Resolve notation prefix to an URI.
- *
- * Revision 1.20 2001/10/12 20:44:01 tng
- * Schema Fix: Notation Uri Binding.
- *
- * Revision 1.19 2001/10/04 15:08:56 knoaman
- * Add support for circular import.
- *
- * Revision 1.18 2001/09/10 14:06:22 tng
- * Schema: AnyAttribute support in Scanner and Validator.
- *
- * Revision 1.17 2001/09/05 20:49:11 knoaman
- * Fix for complexTypes with mixed content model.
- *
- * Revision 1.16 2001/08/30 15:47:46 tng
- * Schema: xsi:type fixes
- *
- * Revision 1.15 2001/08/29 20:52:35 tng
- * Schema: xsi:type support
- *
- * Revision 1.14 2001/08/28 19:20:54 tng
- * Schema: xsi:type support
- *
- * Revision 1.13 2001/08/21 16:06:11 tng
- * Schema: Unique Particle Attribution Constraint Checking.
- *
- * Revision 1.12 2001/08/09 15:23:16 knoaman
- * add support for <anyAttribute> declaration.
- *
- * Revision 1.11 2001/07/26 17:04:11 tng
- * Schema: Process should stop after fatal error, and user throws need to be rethrown.
- *
- * Revision 1.10 2001/07/24 21:23:40 tng
- * Schema: Use DatatypeValidator for ID/IDREF/ENTITY/ENTITIES/NOTATION.
- *
- * Revision 1.9 2001/07/11 21:39:58 peiyongz
- * fix to normalizeWhiteSpace: synchronize fDatatypeBuffer with toFill.
- *
- * Revision 1.8 2001/05/17 18:14:32 tng
- * Schema Fix: if nillable, it's an error to have default value
- *
- * Revision 1.7 2001/05/11 15:17:46 tng
- * Schema: Nillable fixes.
- *
- * Revision 1.6 2001/05/11 13:27:37 tng
- * Copyright update.
- *
- * Revision 1.5 2001/05/10 17:49:42 tng
- * Schema: SchemaValidator fixes
- *
- * Revision 1.4 2001/05/03 20:34:44 tng
- * Schema: SchemaValidator update
- *
- * Revision 1.3 2001/04/19 18:17:39 tng
- * Schema: SchemaValidator update, and use QName in Content Model
- *
- * Revision 1.2 2001/03/30 16:35:19 tng
- * Schema: Whitespace normalization.
- *
- * Revision 1.1 2001/03/21 21:56:33 tng
- * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
- *
+ * $Id $
*/
// ---------------------------------------------------------------------------
@@ -287,6 +24,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/framework/XMLDocumentHandler.hpp>
#include <xercesc/framework/XMLSchemaDescription.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/internal/XMLReader.hpp>
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/internal/ElemStack.hpp>
Modified: xerces/c/trunk/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp?rev=191014&r1=191013&r2=191014&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp Thu Jun 16 15:08:00 2005
@@ -15,69 +15,7 @@
*/
/*
- * $Log$
- * Revision 1.10 2004/09/08 13:56:57 peiyongz
- * Apache License Version 2.0
- *
- * Revision 1.9 2003/12/17 00:18:40 cargilld
- * Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
- *
- * Revision 1.8 2003/07/31 17:14:27 peiyongz
- * Grammar embed grammar description
- *
- * Revision 1.7 2003/06/25 22:38:18 peiyongz
- * to use new GrammarResolver::getGrammar()
- *
- * Revision 1.6 2003/01/13 20:16:51 knoaman
- * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
- *
- * Revision 1.5 2002/11/04 14:49:42 tng
- * C++ Namespace Support.
- *
- * Revision 1.4 2002/09/24 20:12:48 tng
- * Performance: use XMLString::equals instead of XMLString::compareString
- *
- * Revision 1.3 2002/07/12 15:17:48 knoaman
- * For a given global element, store info about a substitution group element
- * as a SchemaElementDecl and not as a string.
- *
- * Revision 1.2 2002/02/25 21:18:18 tng
- * Schema Fix: Ensure no invalid uri index for UPA checking.
- *
- * Revision 1.1.1.1 2002/02/01 22:22:47 peiyongz
- * sane_include
- *
- * Revision 1.11 2001/11/28 16:46:03 tng
- * Schema fix: Initialize the temporary string as null terminated.
- *
- * Revision 1.10 2001/11/21 14:30:13 knoaman
- * Fix for UPA checking.
- *
- * Revision 1.9 2001/11/07 21:50:28 tng
- * Fix comment log that lead to error.
- *
- * Revision 1.8 2001/11/07 21:12:15 tng
- * Performance: Create QName in ContentSpecNode only if it is a leaf/Any/PCDataNode.
- *
- * Revision 1.7 2001/10/04 15:08:56 knoaman
- * Add support for circular import.
- *
- * Revision 1.6 2001/08/21 15:57:51 tng
- * Schema: Add isAllowedByWildcard. Help from James Murphy.
- *
- * Revision 1.5 2001/05/29 19:47:22 knoaman
- * Fix bug - memory was not allocated before call to XMLString::subString
- *
- * Revision 1.4 2001/05/28 20:55:42 tng
- * Schema: Null pointer checking in SubsitutionGropuComparator
- *
- * Revision 1.3 2001/05/11 13:27:37 tng
- * Copyright update.
- *
- * Revision 1.2 2001/05/04 14:50:28 tng
- * Fixed the cvs symbols.
- *
- *
+ * $Id $
*/
@@ -86,6 +24,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/framework/XMLSchemaDescription.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/common/Grammar.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org