tng 2002/11/04 06:47:43
Modified: c/src/xercesc/validators/schema/identity FieldActivator.cpp
FieldActivator.hpp FieldValueMap.cpp
FieldValueMap.hpp IC_Field.cpp IC_Field.hpp
IC_Key.cpp IC_Key.hpp IC_KeyRef.cpp IC_KeyRef.hpp
IC_Selector.cpp IC_Selector.hpp IC_Unique.cpp
IC_Unique.hpp IdentityConstraint.cpp
IdentityConstraint.hpp ValueStore.cpp
ValueStore.hpp ValueStoreCache.cpp
ValueStoreCache.hpp XPathException.hpp
XPathMatcher.cpp XPathMatcher.hpp
XPathMatcherStack.cpp XPathMatcherStack.hpp
XPathSymbols.cpp XPathSymbols.hpp XercesXPath.cpp
XercesXPath.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.3 +7 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldActivator.cpp 27 Aug 2002 05:56:19 -0000 1.2
+++ FieldActivator.cpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -75,6 +78,8 @@
#include <xercesc/validators/schema/identity/ValueStoreCache.hpp>
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// FieldActivator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -145,6 +150,8 @@
valueStore->endValueScope();
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file FieldActivator.cpp
1.3 +8 -4
xml-xerces/c/src/xercesc/validators/schema/identity/FieldActivator.hpp
Index: FieldActivator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/FieldActivator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldActivator.hpp 27 Aug 2002 05:56:19 -0000 1.2
+++ FieldActivator.hpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -71,6 +71,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -107,13 +109,13 @@
// Activation methods
// -----------------------------------------------------------------------
/**
- * Start the value scope for the specified identity constraint. This
- * method is called when the selector matches in order to initialize
+ * Start the value scope for the specified identity constraint. This
+ * method is called when the selector matches in order to initialize
* the value store.
*/
void startValueScopeFor(const IdentityConstraint* const ic, const int
initialDepth);
- /**
+ /**
* Request to activate the specified field. This method returns the
* matcher for the field.
*/
@@ -146,6 +148,8 @@
fMatcherStack = matcherStack;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldValueMap.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ FieldValueMap.cpp 4 Nov 2002 14:47:41 -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:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/FieldValueMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// FieldValueMap: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -132,6 +137,8 @@
return -1;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file FieldValueMap.cpp
1.2 +4 -2
xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.hpp
Index: FieldValueMap.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldValueMap.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ FieldValueMap.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -72,6 +72,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declaration
@@ -129,7 +130,7 @@
// ---------------------------------------------------------------------------
// FieldValueMap: Getter methods
// ---------------------------------------------------------------------------
-inline DatatypeValidator*
+inline DatatypeValidator*
FieldValueMap::getDatatypeValidatorAt(const unsigned int index) const {
if (fValidators) {
@@ -215,6 +216,7 @@
}
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -1 xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.cpp
Index: IC_Field.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Field.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Field.cpp 4 Nov 2002 14:47:41 -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:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/15 17:10:19 knoaman
* Particle derivation checking support.
@@ -74,6 +77,7 @@
#include <xercesc/validators/schema/identity/ValueStore.hpp>
#include <xercesc/validators/schema/identity/XercesXPath.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// FieldMatcher: Constructors and Destructor
@@ -90,7 +94,7 @@
// FieldMatcher: Match methods
// ---------------------------------------------------------------------------
void FieldMatcher::matched(const XMLCh* const content,
- DatatypeValidator* const dv,
+ DatatypeValidator* const dv,
const bool isNil) {
if(isNil) {
@@ -141,6 +145,8 @@
return new FieldMatcher(fXPath, this, valueStore);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IC_Field.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.hpp
Index: IC_Field.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Field.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Field.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -67,6 +67,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -166,6 +168,8 @@
ValueStore* fValueStore;
IC_Field* fField;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/schema/identity/IC_Key.cpp
Index: IC_Key.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Key.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Key.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Key.cpp 4 Nov 2002 14:47:41 -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:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_Key.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_Key: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -82,6 +87,8 @@
IC_Key::~IC_Key()
{
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IC_Key.cpp
1.2 +3 -1 xml-xerces/c/src/xercesc/validators/schema/identity/IC_Key.hpp
Index: IC_Key.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Key.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Key.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Key.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_Key: public IdentityConstraint
{
@@ -100,6 +101,7 @@
return IdentityConstraint::KEY;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/IC_KeyRef.cpp
Index: IC_KeyRef.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_KeyRef.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_KeyRef.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_KeyRef.cpp 4 Nov 2002 14:47:41 -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:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_KeyRef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_KeyRef: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -84,6 +89,8 @@
IC_KeyRef::~IC_KeyRef()
{
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IC_KeyRef.cpp
1.2 +3 -1
xml-xerces/c/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
Index: IC_KeyRef.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_KeyRef.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_KeyRef.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_KeyRef.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_KeyRef: public IdentityConstraint
{
@@ -112,6 +113,7 @@
return fKey;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/IC_Selector.cpp
Index: IC_Selector.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Selector.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IC_Selector.cpp 27 Aug 2002 05:56:19 -0000 1.2
+++ IC_Selector.cpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -82,6 +85,8 @@
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
#include <xercesc/validators/schema/identity/FieldActivator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SelectorMatcher: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -183,6 +188,8 @@
return new SelectorMatcher(fXPath, this, fieldActivator, initialDepth);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IC_Selector.cpp
1.3 +5 -1
xml-xerces/c/src/xercesc/validators/schema/identity/IC_Selector.hpp
Index: IC_Selector.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Selector.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IC_Selector.hpp 27 Aug 2002 05:56:19 -0000 1.2
+++ IC_Selector.hpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -67,6 +67,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -163,6 +165,8 @@
IC_Selector* fSelector;
FieldActivator* fFieldActivator;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/IC_Unique.cpp
Index: IC_Unique.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Unique.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Unique.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Unique.cpp 4 Nov 2002 14:47:41 -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:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_Unique.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_Unique: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -82,6 +87,8 @@
IC_Unique::~IC_Unique()
{
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IC_Unique.cpp
1.2 +3 -1
xml-xerces/c/src/xercesc/validators/schema/identity/IC_Unique.hpp
Index: IC_Unique.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Unique.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IC_Unique.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IC_Unique.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -71,6 +71,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_Unique: public IdentityConstraint
{
@@ -104,6 +105,7 @@
return IdentityConstraint::UNIQUE;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -1
xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
Index: IdentityConstraint.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IdentityConstraint.cpp 24 Sep 2002 19:57:20 -0000 1.2
+++ IdentityConstraint.cpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:57:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -78,6 +81,8 @@
#include <xercesc/validators/schema/identity/IC_Field.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IdentityConstraint: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -160,7 +165,7 @@
delete fSelector;
}
-
+XERCES_CPP_NAMESPACE_END
/**
* End of file IdentityConstraint.cpp
1.2 +5 -1
xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
Index: IdentityConstraint.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdentityConstraint.hpp 1 Feb 2002 22:22:50 -0000 1.1
+++ IdentityConstraint.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -72,6 +72,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/identity/IC_Field.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -218,6 +220,8 @@
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.cpp
Index: ValueStore.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ValueStore.cpp 24 Sep 2002 19:57:20 -0000 1.3
+++ ValueStore.cpp 4 Nov 2002 14:47:41 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:57:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/identity/IC_KeyRef.hpp>
#include <xercesc/validators/schema/identity/ValueStoreCache.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ValueStore: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -375,6 +380,8 @@
}
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ValueStore.cpp
1.2 +8 -4
xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.hpp
Index: ValueStore.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValueStore.hpp 1 Feb 2002 22:22:51 -0000 1.1
+++ ValueStore.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -62,7 +62,7 @@
#define VALUESTORE_HPP
/**
- * This class stores values associated to an identity constraint.
+ * This class stores values associated to an identity constraint.
* Each value stored corresponds to a field declared for the identity
* constraint.
*/
@@ -72,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/FieldValueMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -114,7 +116,7 @@
// -----------------------------------------------------------------------
void duplicateValue();
void reportNilError(IdentityConstraint* const ic);
-
+
private:
// -----------------------------------------------------------------------
// Unimplemented contstructors and operators
@@ -125,7 +127,7 @@
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
- /**
+ /**
* Returns whether a field associated <DatatypeValidator, String> value
* is a duplicate of another associated value.
* It is a duplicate only if either of these conditions are true:
@@ -156,6 +158,8 @@
ValueStore::getIdentityConstraint() const {
return fIdentityConstraint;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
Index: ValueStoreCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValueStoreCache.cpp 28 Aug 2002 13:41:20 -0000 1.4
+++ ValueStoreCache.cpp 4 Nov 2002 14:47:41 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/28 13:41:20 knoaman
* missing type info.
*
@@ -81,6 +84,8 @@
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
#include <xercesc/util/HashPtr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ValueStoreCache: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -200,6 +205,8 @@
fGlobalICMap->put(ic, valueStore);
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ValueStoreCache.cpp
1.4 +4 -1
xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
Index: ValueStoreCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ValueStoreCache.hpp 28 Aug 2002 13:41:20 -0000 1.3
+++ ValueStoreCache.hpp 4 Nov 2002 14:47:41 -0000 1.4
@@ -89,6 +89,8 @@
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
#include <xercesc/validators/schema/identity/IC_Field.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declcaration
// ---------------------------------------------------------------------------
@@ -199,6 +201,7 @@
inline void ValueStoreCache::endDocument() {
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +4 -1
xml-xerces/c/src/xercesc/validators/schema/identity/XPathException.hpp
Index: XPathException.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathException.hpp 1 Feb 2002 22:22:51 -0000 1.1
+++ XPathException.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(XPathException, VALIDATORS_EXPORT)
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +11 -4
xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp
Index: XPathMatcher.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathMatcher.cpp 27 Aug 2002 05:56:19 -0000 1.3
+++ XPathMatcher.cpp 4 Nov 2002 14:47:41 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -83,6 +86,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XPathMatcher: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -109,7 +114,7 @@
}
-XPathMatcher::XPathMatcher(XercesXPath* const xpath,
+XPathMatcher::XPathMatcher(XercesXPath* const xpath,
const bool shouldBufferContent,
IdentityConstraint* const ic)
: fShouldBufferContent(shouldBufferContent)
@@ -196,7 +201,7 @@
for (int i = 0; i < (int) fLocationPathSize; i++) {
- // push context
+ // push context
int startStep = fCurrentStep[i];
fStepIndexes->elementAt(i)->push(startStep);
@@ -227,7 +232,7 @@
continue;
}
-
+
// now if the current step is a descendant step, we let the next
// step do its thing; if it fails, we reset ourselves
// to look at this step for next time we're called.
@@ -364,7 +369,7 @@
for(; j<i && !fMatched[j]; j++) ;
- if (j < i)
+ if (j < i)
continue;
if (fBufferContent) {
@@ -419,6 +424,8 @@
ThrowXML(RuntimeException, XMLExcepts::Regex_NotSupported);
return 0; // to make some compilers happy
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XPathMatcher.cpp
1.3 +6 -3
xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.hpp
Index: XPathMatcher.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathMatcher.hpp 27 Aug 2002 05:56:19 -0000 1.2
+++ XPathMatcher.hpp 4 Nov 2002 14:47:41 -0000 1.3
@@ -69,6 +69,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -99,7 +101,7 @@
// -----------------------------------------------------------------------
// Match methods
// -----------------------------------------------------------------------
- /**
+ /**
* Returns true if XPath has been matched.
*/
bool isMatched();
@@ -137,7 +139,7 @@
void init(XercesXPath* const xpath);
void cleanUp();
- /**
+ /**
* Clears the match values.
*/
void clear();
@@ -198,6 +200,7 @@
delete fStepIndexes;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -0
xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp
Index: XPathMatcherStack.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathMatcherStack.cpp 1 Feb 2002 22:22:51 -0000 1.1
+++ XPathMatcherStack.cpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:51 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XPathMatherStack: Constructors and Destructor
@@ -104,6 +108,7 @@
fMatchersCount = 0;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file XPathMatcherStack.cpp
1.2 +5 -2
xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
Index: XPathMatcherStack.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathMatcherStack.hpp 1 Feb 2002 22:22:51 -0000 1.1
+++ XPathMatcherStack.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XPathMatcherStack
{
@@ -154,13 +155,15 @@
if (fMatchersCount == fMatchers->size()) {
- fMatchers->addElement(matcher);
+ fMatchers->addElement(matcher);
fMatchersCount++;
}
else {
fMatchers->setElementAt(matcher, fMatchersCount++);
}
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.cpp
Index: XPathSymbols.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathSymbols.cpp 1 Feb 2002 22:22:51 -0000 1.1
+++ XPathSymbols.cpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:51 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -71,6 +74,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/validators/schema/identity/XPathSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaSymbols: Static data
// ---------------------------------------------------------------------------
@@ -195,6 +200,8 @@
{
chLatin_s, chLatin_e, chLatin_l, chLatin_f, chNull
};
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XPathSymbols.cpp
1.2 +5 -1
xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.hpp
Index: XPathSymbols.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathSymbols.hpp 1 Feb 2002 22:22:52 -0000 1.1
+++ XPathSymbols.hpp 4 Nov 2002 14:47:41 -0000 1.2
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Collection of symbols used to parse a Schema Grammar
*/
@@ -96,6 +98,8 @@
static const XMLCh fgSYMBOL_SELF[];
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +16 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesXPath.cpp 30 Oct 2002 21:52:01 -0000 1.2
+++ XercesXPath.cpp 4 Nov 2002 14:47:42 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/30 21:52:01 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right
thing.
*
@@ -86,11 +89,13 @@
#include <xercesc/internal/XMLReader.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static data
// ---------------------------------------------------------------------------
-const XMLByte XPathScanner::fASCIICharMap[128] =
+const XMLByte XPathScanner::fASCIICharMap[128] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 2, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -326,7 +331,7 @@
if (stepSize) {
if (locPath->getStep(stepSize - 1)->getAxisType() ==
XercesStep::ATTRIBUTE) {
ThrowXML(XPathException, XMLExcepts::XPath_NoAttrSelector);
- }
+ }
}
}
}
@@ -454,7 +459,7 @@
firstTokenOfLocationPath=false;
break;
}
- case XercesXPath::EXPRTOKEN_DOUBLE_COLON:
+ case XercesXPath::EXPRTOKEN_DOUBLE_COLON:
{
// should never have a bare double colon
ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleColon);
@@ -557,21 +562,21 @@
}
case XercesXPath::EXPRTOKEN_OPERATOR_DOUBLE_SLASH:
{
- ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleForwardSlash);
+ ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleForwardSlash);
}
case XercesXPath::EXPRTOKEN_OPERATOR_SLASH:
{
if (i == 0) {
- ThrowXML(XPathException,
XMLExcepts::XPath_NoForwardSlashAtStart);
+ ThrowXML(XPathException,
XMLExcepts::XPath_NoForwardSlashAtStart);
}
// keep on truckin'
if (firstTokenOfLocationPath) {
- ThrowXML(XPathException, XMLExcepts::XPath_NoSelectionOfRoot);
+ ThrowXML(XPathException, XMLExcepts::XPath_NoSelectionOfRoot);
}
if (i == tokenCount - 1) {
- ThrowXML(XPathException, XMLExcepts::XPath_ExpectedStep3);
+ ThrowXML(XPathException, XMLExcepts::XPath_ExpectedStep3);
}
firstTokenOfLocationPath=false;
@@ -881,7 +886,7 @@
while (ch != qchar) {
if (++currentOffset == endOffset) {
return false; // REVISIT
- }
+ }
ch = data[currentOffset];
}
@@ -1008,7 +1013,7 @@
nameOffset = currentOffset;
currentOffset = scanNCName(data, endOffset, currentOffset);
if (currentOffset == nameOffset) {
- return false; // REVISIT
+ return false; // REVISIT
}
if (currentOffset < endOffset) {
@@ -1306,6 +1311,8 @@
ThrowXML(XPathException, XMLExcepts::XPath_TokenNotSupported);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XercesPath.cpp
1.2 +7 -3
xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.hpp
Index: XercesXPath.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesXPath.hpp 1 Feb 2002 22:22:51 -0000 1.1
+++ XercesXPath.hpp 4 Nov 2002 14:47:42 -0000 1.2
@@ -69,6 +69,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -359,7 +361,7 @@
bool scanExpression(const XMLCh* const data, int currentOffset,
const int endOffset, ValueVectorOf<int>* const tokens);
-protected:
+protected:
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
@@ -431,7 +433,7 @@
XPathScannerForSchema(XMLStringPool* const stringPool);
~XPathScannerForSchema() {}
-protected:
+protected:
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
@@ -489,6 +491,8 @@
return fLocationPaths;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
