tng 2002/11/04 06:49:44
Modified: c/src/xercesc/validators/schema ComplexTypeInfo.cpp
ComplexTypeInfo.hpp GeneralAttributeCheck.cpp
GeneralAttributeCheck.hpp NamespaceScope.cpp
NamespaceScope.hpp SchemaAttDef.cpp
SchemaAttDef.hpp SchemaAttDefList.cpp
SchemaAttDefList.hpp SchemaElementDecl.cpp
SchemaElementDecl.hpp SchemaGrammar.cpp
SchemaGrammar.hpp SchemaInfo.cpp SchemaInfo.hpp
SchemaSymbols.cpp SchemaSymbols.hpp
SchemaValidator.cpp SchemaValidator.hpp
SubstitutionGroupComparator.cpp
SubstitutionGroupComparator.hpp TraverseSchema.cpp
TraverseSchema.hpp XSDDOMParser.cpp
XSDDOMParser.hpp XSDErrorReporter.cpp
XSDErrorReporter.hpp XSDLocator.cpp XSDLocator.hpp
XUtil.cpp XUtil.hpp XercesAttGroupInfo.cpp
XercesAttGroupInfo.hpp XercesElementWildcard.cpp
XercesElementWildcard.hpp XercesGroupInfo.cpp
XercesGroupInfo.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.4 +6 -0 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp
Index: ComplexTypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComplexTypeInfo.cpp 21 Mar 2002 15:34:40 -0000 1.3
+++ ComplexTypeInfo.cpp 4 Nov 2002 14:49:41 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/03/21 15:34:40 knoaman
* Add support for reporting line/column numbers of schema errors.
*
@@ -162,6 +165,8 @@
#include <xercesc/validators/common/SimpleContentModel.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ComplexTypeInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -744,6 +749,7 @@
fContentSpecOrgURISize = newSize;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file ComplexTypeInfo.cpp
1.6 +5 -1 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp
Index: ComplexTypeInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComplexTypeInfo.hpp 24 Sep 2002 20:12:48 -0000 1.5
+++ ComplexTypeInfo.hpp 4 Nov 2002 14:49:41 -0000 1.6
@@ -79,6 +79,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
@@ -517,6 +519,8 @@
return false;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.9 +7 -0
xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
Index: GeneralAttributeCheck.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GeneralAttributeCheck.cpp 27 Sep 2002 13:22:52 -0000 1.8
+++ GeneralAttributeCheck.cpp 4 Nov 2002 14:49:41 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * 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.
*
@@ -148,6 +151,8 @@
#include <xercesc/util/XMLRegisterCleanup.hpp>
#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local const data
// ---------------------------------------------------------------------------
@@ -926,6 +931,8 @@
SchemaSymbols::fgATT_VERSION,
SchemaSymbols::fgATT_XPATH,
};
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file GeneralAttributeCheck.cpp
1.6 +7 -5
xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
Index: GeneralAttributeCheck.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GeneralAttributeCheck.hpp 27 May 2002 19:54:57 -0000 1.5
+++ GeneralAttributeCheck.hpp 4 Nov 2002 14:49:41 -0000 1.6
@@ -61,7 +61,6 @@
#if !defined(GENERALATTRIBUTECHECK_HPP)
#define GENERALATTRIBUTECHECK_HPP
-
/**
* A general purpose class to check for valid values of attributes, as well
* as check for proper association with corresponding schema elements.
@@ -76,6 +75,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/util/ValueHashTableOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward declaration
// ---------------------------------------------------------------------------
@@ -184,14 +185,14 @@
A_Value,
A_Version,
A_XPath,
-
+
A_Count,
A_Invalid = -1
};
//Validators
enum {
-
+
DV_String = 0,
DV_AnyURI = 4,
DV_NonNegInt = 8,
@@ -205,7 +206,7 @@
DV_Use = 2048,
DV_WhiteSpace = 4096,
- DV_Mask = (DV_AnyURI | DV_NonNegInt | DV_Boolean | DV_ID | DV_Form |
+ DV_Mask = (DV_AnyURI | DV_NonNegInt | DV_Boolean | DV_ID | DV_Form |
DV_MaxOccurs | DV_MaxOccurs1 | DV_MinOccurs1 |
DV_ProcessContents | DV_Use | DV_WhiteSpace)
};
@@ -307,6 +308,7 @@
fIDRefList = refList;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -0 xml-xerces/c/src/xercesc/validators/schema/NamespaceScope.cpp
Index: NamespaceScope.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/NamespaceScope.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamespaceScope.cpp 1 Feb 2002 22:22:45 -0000 1.1
+++ NamespaceScope.cpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:45 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
+ * sane_include
*
* Revision 1.3 2001/07/31 15:26:54 knoaman
* Added support for <attributeGroup>.
@@ -77,6 +80,7 @@
#include <xercesc/util/EmptyStackException.hpp>
#include <xercesc/validators/schema/NamespaceScope.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// NamespaceScope: Constructors and Destructor
@@ -296,6 +300,7 @@
fStackCapacity = newCapacity;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file NamespaceScope.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/validators/schema/NamespaceScope.hpp
Index: NamespaceScope.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/NamespaceScope.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamespaceScope.hpp 1 Feb 2002 22:22:45 -0000 1.1
+++ NamespaceScope.hpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/StringPool.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// NamespaceScope provides a data structure for mapping namespace prefixes
// to their URI's. The mapping accurately reflects the scoping of namespaces
@@ -191,6 +193,8 @@
{
return (fStackTop == 0);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +8 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp
Index: SchemaAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttDef.cpp 1 Feb 2002 22:22:45 -0000 1.1
+++ SchemaAttDef.cpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:45 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
+ * sane_include
*
* Revision 1.4 2001/08/09 15:23:16 knoaman
* add support for <anyAttribute> declaration.
@@ -80,6 +83,8 @@
#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaAttDef: Implementation of the XMLAttDef interface
// ---------------------------------------------------------------------------
@@ -138,7 +143,7 @@
, fNamespaceList(0)
{
QName* otherName = other->getAttName();
- fAttName = new QName(otherName->getPrefix(),
+ fAttName = new QName(otherName->getPrefix(),
otherName->getLocalPart(), otherName->getURI());
if (other->fNamespaceList && other->fNamespaceList->size()) {
@@ -162,3 +167,5 @@
{
fAttName->setName(prefix, localPart, uriId);
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp
Index: SchemaAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttDef.hpp 1 Feb 2002 22:22:46 -0000 1.1
+++ SchemaAttDef.hpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.6 2001/08/10 12:34:25 knoaman
* Fix compilation error.
@@ -85,6 +88,8 @@
#include <xercesc/framework/XMLAttDef.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DatatypeValidator;
class QName;
@@ -241,5 +246,7 @@
resetNamespaceList();
}
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp
Index: SchemaAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttDefList.cpp 1 Feb 2002 22:22:46 -0000 1.1
+++ SchemaAttDefList.cpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:34 tng
* Copyright update.
@@ -73,6 +76,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/SchemaAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaAttDefList: Constructors and Destructor
@@ -152,3 +156,5 @@
{
fEnum->Reset();
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +6 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp
Index: SchemaAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttDefList.hpp 1 Feb 2002 22:22:46 -0000 1.1
+++ SchemaAttDefList.hpp 4 Nov 2002 14:49:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:34 tng
* Copyright update.
@@ -74,6 +77,7 @@
#include <xercesc/util/RefHash2KeysTableOf.hpp>
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the framework abstract class which defines the
@@ -146,5 +150,7 @@
RefHash2KeysTableOfEnumerator<SchemaAttDef>* fEnum;
RefHash2KeysTableOf<SchemaAttDef>* fList;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.6 +8 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaElementDecl.cpp 12 Jul 2002 15:17:48 -0000 1.5
+++ SchemaElementDecl.cpp 4 Nov 2002 14:49:41 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 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.
@@ -140,6 +143,8 @@
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaElementDecl: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -271,7 +276,7 @@
if (fXsiComplexTypeInfo) {
return fXsiComplexTypeInfo->getAttDefList();
}
- else if (!fComplexTypeInfo)
+ else if (!fComplexTypeInfo)
{
ThrowXML(RuntimeException, XMLExcepts::DV_InvalidOperation);
}
@@ -385,3 +390,4 @@
return 0;
}
+XERCES_CPP_NAMESPACE_END
1.7 +8 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp
Index: SchemaElementDecl.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SchemaElementDecl.hpp 12 Jul 2002 15:17:48 -0000 1.6
+++ SchemaElementDecl.hpp 4 Nov 2002 14:49:41 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 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.
@@ -134,6 +137,8 @@
#include <xercesc/validators/schema/ComplexTypeInfo.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class SchemaAttDefList;
class DatatypeValidator;
@@ -564,5 +569,7 @@
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +5 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp
Index: SchemaGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchemaGrammar.cpp 11 Jul 2002 18:21:20 -0000 1.2
+++ SchemaGrammar.cpp 4 Nov 2002 14:49:41 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:21:20 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -109,6 +112,7 @@
#include <xercesc/validators/schema/XercesGroupInfo.hpp>
#include <xercesc/validators/schema/XercesAttGroupInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaGrammar: Constructors and Destructor
@@ -234,3 +238,4 @@
delete fIDRefList;
}
+XERCES_CPP_NAMESPACE_END
1.5 +10 -3 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp
Index: SchemaGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaGrammar.hpp 22 Aug 2002 15:42:10 -0000 1.4
+++ SchemaGrammar.hpp 4 Nov 2002 14:49:41 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/22 15:42:10 tng
* Remove unused parameter variables in inline functions.
*
@@ -125,6 +128,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class stores the Schema information
// NOTE: Schemas are not namespace aware, so we just use regular NameIdPool
@@ -288,7 +293,7 @@
//
// fElemDeclPool
// This is the element decl pool. It contains all of the elements
- // declared in the Schema (and their associated attributes.)
+ // declared in the Schema (and their associated attributes.)
//
// fElemNonDeclPool
// This is the element decl pool that is is populated as new elements
@@ -485,7 +490,7 @@
inline const XMLElementDecl* SchemaGrammar::getElemDecl( const unsigned int uriId
, const XMLCh* const baseName
- , const XMLCh* const
+ , const XMLCh* const
, unsigned int scope )
const
{
const SchemaElementDecl* decl = fElemDeclPool->getByKey(baseName, uriId, scope);
@@ -503,7 +508,7 @@
inline XMLElementDecl* SchemaGrammar::getElemDecl (const unsigned int uriId
, const XMLCh* const baseName
- , const XMLCh* const
+ , const XMLCh* const
, unsigned int scope )
{
SchemaElementDecl* decl = fElemDeclPool->getByKey(baseName, uriId, scope);
@@ -581,5 +586,7 @@
{
fValidated = newState;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.9 +7 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp
Index: SchemaInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SchemaInfo.cpp 24 Sep 2002 20:12:48 -0000 1.8
+++ SchemaInfo.cpp 4 Nov 2002 14:49:41 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -109,6 +112,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -309,6 +314,8 @@
}
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file SchemaInfo.cpp
1.10 +5 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp
Index: SchemaInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SchemaInfo.hpp 1 Oct 2002 19:47:44 -0000 1.9
+++ SchemaInfo.hpp 4 Nov 2002 14:49:41 -0000 1.10
@@ -81,6 +81,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SchemaInfo
{
public:
@@ -433,6 +435,8 @@
fTopLevelComponents[i] = 0;
}
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +10 -4 xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.cpp
Index: SchemaSymbols.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchemaSymbols.cpp 27 May 2002 19:39:25 -0000 1.2
+++ SchemaSymbols.cpp 4 Nov 2002 14:49:42 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 19:39:25 knoaman
* remove unused constants.
*
@@ -115,6 +118,7 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaSymbols: Static data
@@ -972,7 +976,7 @@
const XMLCh SchemaSymbols::fgDT_DATETIME[] =
{
- chLatin_d, chLatin_a, chLatin_t, chLatin_e,
+ chLatin_d, chLatin_a, chLatin_t, chLatin_e,
chLatin_T, chLatin_i, chLatin_m, chLatin_e, chNull
};
@@ -988,7 +992,7 @@
const XMLCh SchemaSymbols::fgDT_DURATION[] =
{
- chLatin_d, chLatin_u, chLatin_r, chLatin_a,
+ chLatin_d, chLatin_u, chLatin_r, chLatin_a,
chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
};
@@ -1004,7 +1008,7 @@
const XMLCh SchemaSymbols::fgDT_MONTHDAY[] =
{
- chLatin_g, chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h,
+ chLatin_g, chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h,
chLatin_D, chLatin_a, chLatin_y, chNull
};
@@ -1015,7 +1019,7 @@
const XMLCh SchemaSymbols::fgDT_YEARMONTH[] =
{
- chLatin_g, chLatin_Y, chLatin_e, chLatin_a, chLatin_r,
+ chLatin_g, chLatin_Y, chLatin_e, chLatin_a, chLatin_r,
chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h, chNull
};
@@ -1083,6 +1087,8 @@
const int SchemaSymbols::fgINT_MIN_VALUE = 0x80000000;
const int SchemaSymbols::fgINT_MAX_VALUE = 0x7fffffff;
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file SchemaSymbols.cpp
1.4 +6 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp
Index: SchemaSymbols.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SchemaSymbols.hpp 27 May 2002 19:39:25 -0000 1.3
+++ SchemaSymbols.hpp 4 Nov 2002 14:49:42 -0000 1.4
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Collection of symbols used to parse a Schema Grammar
*/
@@ -221,7 +223,7 @@
static const XMLCh fgDT_USHORT[];
static const XMLCh fgDT_UBYTE[];
static const XMLCh fgDT_POSITIVEINTEGER[];
-//datetime
+//datetime
static const XMLCh fgDT_DATETIME[];
static const XMLCh fgDT_DATE[];
static const XMLCh fgDT_TIME[];
@@ -271,6 +273,8 @@
};
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.17 +6 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp
Index: SchemaValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SchemaValidator.cpp 24 Sep 2002 20:12:48 -0000 1.16
+++ SchemaValidator.cpp 4 Nov 2002 14:49:42 -0000 1.17
@@ -56,6 +56,9 @@
/*
* $Log$
+ * 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
*
@@ -207,6 +210,8 @@
#include <xercesc/validators/schema/XercesGroupInfo.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1895,3 +1900,4 @@
}
+XERCES_CPP_NAMESPACE_END
1.9 +7 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp
Index: SchemaValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SchemaValidator.hpp 4 Sep 2002 18:17:41 -0000 1.8
+++ SchemaValidator.hpp 4 Nov 2002 14:49:42 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/09/04 18:17:41 tng
* Do not set IDREF to used during prevalidation.
*
@@ -127,6 +130,8 @@
#include <xercesc/validators/schema/SchemaGrammar.hpp>
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a derivative of the abstract validator interface. This class
// implements a validator that supports standard XML Schema semantics.
@@ -427,5 +432,7 @@
}
return false;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0
xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
Index: SubstitutionGroupComparator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SubstitutionGroupComparator.cpp 24 Sep 2002 20:12:48 -0000 1.4
+++ SubstitutionGroupComparator.cpp 4 Nov 2002 14:49:42 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * 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
*
@@ -112,6 +115,8 @@
#include <xercesc/validators/schema/ComplexTypeInfo.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
bool SubstitutionGroupComparator::isEquivalentTo(QName* const anElement
, QName* const exemplar)
{
@@ -265,6 +270,8 @@
}
return false;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file SubstitutionGroupComparator.cpp
1.2 +5 -1
xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
Index: SubstitutionGroupComparator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SubstitutionGroupComparator.hpp 1 Feb 2002 22:22:47 -0000 1.1
+++ SubstitutionGroupComparator.hpp 4 Nov 2002 14:49:42 -0000 1.2
@@ -65,6 +65,8 @@
#include <xercesc/util/QName.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SchemaGrammar;
class VALIDATORS_EXPORT SubstitutionGroupComparator
@@ -153,6 +155,8 @@
inline SubstitutionGroupComparator::~SubstitutionGroupComparator()
{}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.31 +5 -1 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TraverseSchema.cpp 30 Oct 2002 21:52:00 -0000 1.30
+++ TraverseSchema.cpp 4 Nov 2002 14:49:42 -0000 1.31
@@ -92,6 +92,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/impl/XSDElementNSImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// TraverseSchema: Local declaration
// ---------------------------------------------------------------------------
@@ -7711,6 +7713,8 @@
delete fLocator;
delete fParser;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file TraverseSchema.cpp
1.16 +6 -2 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp
Index: TraverseSchema.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TraverseSchema.hpp 15 Oct 2002 18:41:48 -0000 1.15
+++ TraverseSchema.hpp 4 Nov 2002 14:49:42 -0000 1.16
@@ -83,6 +83,8 @@
#include <xercesc/validators/schema/GeneralAttributeCheck.hpp>
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -946,13 +948,15 @@
}
else if (*pszSrc == 0xFFFF) { //escaped character
pszSrc++;
- }
+ }
else {
normalizedURI.append(*pszSrc);
pszSrc++;
}
}
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.8 +3 -1 xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp
Index: XSDDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSDDOMParser.cpp 27 Sep 2002 12:41:48 -0000 1.7
+++ XSDDOMParser.cpp 4 Nov 2002 14:49:42 -0000 1.8
@@ -67,6 +67,7 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XSDDOMParser: Constructors and Destructor
@@ -144,3 +145,4 @@
return 0;
}
+XERCES_CPP_NAMESPACE_END
1.6 +3 -1 xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.hpp
Index: XSDDOMParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSDDOMParser.hpp 30 May 2002 16:39:07 -0000 1.5
+++ XSDDOMParser.hpp 4 Nov 2002 14:49:42 -0000 1.6
@@ -65,6 +65,7 @@
#include <xercesc/parsers/XercesDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
class XMLValidator;
@@ -159,5 +160,6 @@
return fSawFatal;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +6 -0 xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.cpp
Index: XSDErrorReporter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSDErrorReporter.cpp 24 Sep 2002 20:12:48 -0000 1.3
+++ XSDErrorReporter.cpp 4 Nov 2002 14:49:42 -0000 1.4
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static data
// ---------------------------------------------------------------------------
@@ -273,3 +278,4 @@
throw toEmit;
}
+XERCES_CPP_NAMESPACE_END
1.3 +5 -1 xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.hpp
Index: XSDErrorReporter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSDErrorReporter.hpp 22 May 2002 20:54:14 -0000 1.2
+++ XSDErrorReporter.hpp 4 Nov 2002 14:49:42 -0000 1.3
@@ -62,6 +62,9 @@
#if !defined(XSDERRORREPORTER_HPP)
#define XSDERRORREPORTER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class Locator;
class XMLErrorReporter;
@@ -149,5 +152,6 @@
fErrorReporter = errorReporter;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/validators/schema/XSDLocator.cpp
Index: XSDLocator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDLocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSDLocator.cpp 27 May 2002 18:44:07 -0000 1.2
+++ XSDLocator.cpp 4 Nov 2002 14:49:42 -0000 1.3
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:44:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column
number.
*
@@ -70,6 +73,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XSDLocator: Constructors and Destructor
@@ -96,3 +100,5 @@
fSystemId = systemId;
fPublicId = publicId;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +4 -1 xml-xerces/c/src/xercesc/validators/schema/XSDLocator.hpp
Index: XSDLocator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDLocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSDLocator.hpp 27 May 2002 18:44:07 -0000 1.2
+++ XSDLocator.hpp 4 Nov 2002 14:49:42 -0000 1.3
@@ -68,6 +68,7 @@
#include <xercesc/sax/Locator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XSDLocator: public Locator
{
@@ -173,5 +174,7 @@
{
return fSystemId;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +6 -0 xml-xerces/c/src/xercesc/validators/schema/XUtil.cpp
Index: XUtil.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XUtil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XUtil.cpp 24 Sep 2002 20:12:48 -0000 1.4
+++ XUtil.cpp 4 Nov 2002 14:49:42 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * 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
*
@@ -101,6 +104,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// Finds and returns the first child element node.
DOMElement* XUtil::getFirstChildElement(const DOMNode* const parent)
{
@@ -189,3 +194,4 @@
return 0;
}
+XERCES_CPP_NAMESPACE_END
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/schema/XUtil.hpp
Index: XUtil.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XUtil.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XUtil.hpp 21 May 2002 19:31:45 -0000 1.3
+++ XUtil.hpp 4 Nov 2002 14:49:42 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/21 19:31:45 tng
* DOM Reorganization: modify to use the new DOM interface and remove obsolete code
in XUtil.
*
@@ -84,6 +87,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMNode;
class DOMElement;
@@ -121,5 +126,7 @@
~XUtil() {};
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0
xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
Index: XercesAttGroupInfo.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesAttGroupInfo.cpp 24 Sep 2002 20:12:48 -0000 1.2
+++ XercesAttGroupInfo.cpp 4 Nov 2002 14:49:42 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -82,6 +85,8 @@
#include <xercesc/validators/schema/XercesAttGroupInfo.hpp>
#include <xercesc/util/QName.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XercesAttGroupInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -152,6 +157,8 @@
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XercesAttGroupInfo.cpp
1.2 +9 -7
xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
Index: XercesAttGroupInfo.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttGroupInfo.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ XercesAttGroupInfo.hpp 4 Nov 2002 14:49:42 -0000 1.2
@@ -74,7 +74,7 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XercesAttGroupInfo
{
@@ -90,7 +90,7 @@
// -----------------------------------------------------------------------
bool containsTypeWithId() const;
unsigned int attributeCount() const;
- unsigned int anyAttributeCount() const;
+ unsigned int anyAttributeCount() const;
SchemaAttDef* attributeAt(const unsigned int index);
const SchemaAttDef* attributeAt(const unsigned int index) const;
SchemaAttDef* anyAttributeAt(const unsigned int index);
@@ -98,7 +98,7 @@
SchemaAttDef* getCompleteWildCard() const;
const SchemaAttDef* getAttDef(const XMLCh* const baseName,
const int uriId) const;
-
+
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
@@ -164,7 +164,7 @@
return 0;
}
-inline const SchemaAttDef*
+inline const SchemaAttDef*
XercesAttGroupInfo::attributeAt(const unsigned int index) const {
if (fAttributes) {
@@ -184,7 +184,7 @@
return 0;
}
-inline const SchemaAttDef*
+inline const SchemaAttDef*
XercesAttGroupInfo::anyAttributeAt(const unsigned int index) const {
if (fAnyAttributes) {
@@ -226,7 +226,7 @@
inline void XercesAttGroupInfo::addAnyAttDef(SchemaAttDef* const toAdd,
const bool toClone) {
- if (!fAnyAttributes) {
+ if (!fAnyAttributes) {
fAnyAttributes = new RefVectorOf<SchemaAttDef>(2);
}
@@ -247,6 +247,8 @@
fCompleteWildCard = toSet;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -0
xml-xerces/c/src/xercesc/validators/schema/XercesElementWildcard.cpp
Index: XercesElementWildcard.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesElementWildcard.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementWildcard.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ XercesElementWildcard.cpp 4 Nov 2002 14:49:42 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -76,6 +79,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local methods
@@ -163,3 +167,4 @@
return false;
}
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/schema/XercesElementWildcard.hpp
Index: XercesElementWildcard.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesElementWildcard.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementWildcard.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ XercesElementWildcard.hpp 4 Nov 2002 14:49:42 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -76,6 +79,8 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward declarations
// ---------------------------------------------------------------------------
@@ -122,6 +127,8 @@
XercesElementWildcard();
~XercesElementWildcard();
};
+
+XERCES_CPP_NAMESPACE_END
#endif // XERCESELEMENTWILDCARD_HPP
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.cpp
Index: XercesGroupInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesGroupInfo.cpp 1 Apr 2002 15:47:06 -0000 1.3
+++ XercesGroupInfo.cpp 4 Nov 2002 14:49:42 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/04/01 15:47:06 knoaman
* Move Element Consistency checking (ref to global declarations) to
SchemaValidator.
*
@@ -80,6 +83,8 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XercesGroupInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -113,6 +118,8 @@
fLocator = aLocator;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XercesGroupInfo.cpp
1.4 +6 -3 xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.hpp
Index: XercesGroupInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesGroupInfo.hpp 1 Apr 2002 15:47:06 -0000 1.3
+++ XercesGroupInfo.hpp 4 Nov 2002 14:49:42 -0000 1.4
@@ -74,6 +74,7 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declarations
@@ -149,13 +150,13 @@
return fContentSpec;
}
-inline SchemaElementDecl*
+inline SchemaElementDecl*
XercesGroupInfo::elementAt(const unsigned int index) {
return fElements->elementAt(index);
}
-inline const SchemaElementDecl*
+inline const SchemaElementDecl*
XercesGroupInfo::elementAt(const unsigned int index) const {
return fElements->elementAt(index);
@@ -204,6 +205,8 @@
fCheckElementConsistency = aValue;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
