You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/11/04 15:53:31 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/datatype AbstractNumericFacetValidator.cpp AbstractNumericFacetValidator.hpp AbstractNumericValidator.cpp AbstractNumericValidator.hpp AbstractStringValidator.cpp AbstractStringValidator.hpp AnySimpleTypeDatatypeValidator.cpp AnySimpleTypeDatatypeValidator.hpp AnyURIDatatypeValidator.cpp AnyURIDatatypeValidator.hpp Base64BinaryDatatypeValidator.cpp Base64BinaryDatatypeValidator.hpp BooleanDatatypeValidator.cpp BooleanDatatypeValidator.hpp DatatypeValidator.cpp DatatypeValidator.hpp DatatypeValidatorFactory.cpp DatatypeValidatorFactory.hpp DateDatatypeValidator.cpp DateDatatypeValidator.hpp DateTimeDatatypeValidator.cpp DateTimeDatatypeValidator.hpp DateTimeValidator.cpp DateTimeValidator.hpp DayDatatypeValidator.cpp DayDatatypeValidator.hpp DecimalDatatypeValidator.cpp DecimalDatatypeValidator.hpp DoubleDatatypeValidator.cpp DoubleDatatypeValidator.hpp DurationDatatypeValidator.cpp DurationDatatypeValidator.hpp ENTITYDatatypeValidator.cpp ENTITYDatatypeValidator.hpp FloatDatatypeValidator.cpp FloatDatatypeValidator.hpp HexBinaryDatatypeValidator.cpp HexBinaryDatatypeValidator.hpp IDDatatypeValidator.cpp IDDatatypeValidator.hpp IDREFDatatypeValidator.cpp IDREFDatatypeValidator.hpp InvalidDatatypeFacetException.hpp InvalidDatatypeValueException.hpp ListDatatypeValidator.cpp ListDatatypeValidator.hpp MonthDatatypeValidator.cpp MonthDatatypeValidator.hpp MonthDayDatatypeValidator.cpp MonthDayDatatypeValidator.hpp NCNameDatatypeValidator.cpp NCNameDatatypeValidator.hpp NOTATIONDatatypeValidator.cpp NOTATIONDatatypeValidator.hpp NameDatatypeValidator.cpp NameDatatypeValidator.hpp QNameDatatypeValidator.cpp QNameDatatypeValidator.hpp StringDatatypeValidator.cpp StringDatatypeValidator.hpp TimeDatatypeValidator.cpp TimeDatatypeValidator.hpp UnionDatatypeValidator.cpp UnionDatatypeValidator.hpp YearDatatypeValidator.cpp YearDatatypeValidator.hpp YearMonthDatatypeValidator.cpp YearMonthDatatypeValidator.hpp
tng 2002/11/04 06:53:31
Modified: c/src/xercesc/validators/datatype
AbstractNumericFacetValidator.cpp
AbstractNumericFacetValidator.hpp
AbstractNumericValidator.cpp
AbstractNumericValidator.hpp
AbstractStringValidator.cpp
AbstractStringValidator.hpp
AnySimpleTypeDatatypeValidator.cpp
AnySimpleTypeDatatypeValidator.hpp
AnyURIDatatypeValidator.cpp
AnyURIDatatypeValidator.hpp
Base64BinaryDatatypeValidator.cpp
Base64BinaryDatatypeValidator.hpp
BooleanDatatypeValidator.cpp
BooleanDatatypeValidator.hpp DatatypeValidator.cpp
DatatypeValidator.hpp DatatypeValidatorFactory.cpp
DatatypeValidatorFactory.hpp
DateDatatypeValidator.cpp DateDatatypeValidator.hpp
DateTimeDatatypeValidator.cpp
DateTimeDatatypeValidator.hpp DateTimeValidator.cpp
DateTimeValidator.hpp DayDatatypeValidator.cpp
DayDatatypeValidator.hpp
DecimalDatatypeValidator.cpp
DecimalDatatypeValidator.hpp
DoubleDatatypeValidator.cpp
DoubleDatatypeValidator.hpp
DurationDatatypeValidator.cpp
DurationDatatypeValidator.hpp
ENTITYDatatypeValidator.cpp
ENTITYDatatypeValidator.hpp
FloatDatatypeValidator.cpp
FloatDatatypeValidator.hpp
HexBinaryDatatypeValidator.cpp
HexBinaryDatatypeValidator.hpp
IDDatatypeValidator.cpp IDDatatypeValidator.hpp
IDREFDatatypeValidator.cpp
IDREFDatatypeValidator.hpp
InvalidDatatypeFacetException.hpp
InvalidDatatypeValueException.hpp
ListDatatypeValidator.cpp ListDatatypeValidator.hpp
MonthDatatypeValidator.cpp
MonthDatatypeValidator.hpp
MonthDayDatatypeValidator.cpp
MonthDayDatatypeValidator.hpp
NCNameDatatypeValidator.cpp
NCNameDatatypeValidator.hpp
NOTATIONDatatypeValidator.cpp
NOTATIONDatatypeValidator.hpp
NameDatatypeValidator.cpp NameDatatypeValidator.hpp
QNameDatatypeValidator.cpp
QNameDatatypeValidator.hpp
StringDatatypeValidator.cpp
StringDatatypeValidator.hpp
TimeDatatypeValidator.cpp TimeDatatypeValidator.hpp
UnionDatatypeValidator.cpp
UnionDatatypeValidator.hpp
YearDatatypeValidator.cpp YearDatatypeValidator.hpp
YearMonthDatatypeValidator.cpp
YearMonthDatatypeValidator.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.5 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
Index: AbstractNumericFacetValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractNumericFacetValidator.cpp 24 Sep 2002 19:44:40 -0000 1.4
+++ AbstractNumericFacetValidator.cpp 4 Nov 2002 14:53:27 -0000 1.5
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -98,6 +101,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const int AbstractNumericFacetValidator::INDETERMINATE = 2;
#define REPORT_FACET_ERROR(val1, val2, except_code) \
@@ -797,6 +802,8 @@
{
return (fEnumerationInherited? getBaseValidator()->getEnumString() : fStrEnumeration );
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file AbstractNumericFacetValidator::cpp
1.4 +13 -4 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
Index: AbstractNumericFacetValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractNumericFacetValidator.hpp 18 Oct 2002 16:52:14 -0000 1.3
+++ AbstractNumericFacetValidator.hpp 4 Nov 2002 14:53:27 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/18 16:52:14 peiyongz
* Patch to Bug#13640: Getter methods not public in
* DecimalDatatypeValidator
@@ -85,6 +88,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLNumber.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractNumericFacetValidator : public DatatypeValidator
{
public:
@@ -164,7 +169,7 @@
// Protected data members
//
// Allow access to derived class
- //
+ //
// -----------------------------------------------------------------------
bool fMaxInclusiveInherited;
bool fMaxExclusiveInherited;
@@ -189,7 +194,7 @@
void inspectFacetBase();
void inheritFacet();
-
+
};
// -----------------------------------------------------------------------
@@ -221,7 +226,10 @@
return fEnumeration;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractNumericFacetValidator.hpp
*/
-#endif
1.2 +11 -4 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
Index: AbstractNumericValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractNumericValidator.cpp 1 Feb 2002 22:22:39 -0000 1.1
+++ AbstractNumericValidator.cpp 4 Nov 2002 14:53:27 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.2 2001/10/09 21:16:31 peiyongz
* . macro to simplify code
@@ -74,6 +77,8 @@
#include <xercesc/validators/datatype/AbstractNumericValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
#define REPORT_VALUE_ERROR(val1, val2, except_code) \
XMLCh* value1 = (val1)->toString(); \
ArrayJanitor<XMLCh> jan1(value1); \
@@ -82,7 +87,7 @@
ThrowXML2(InvalidDatatypeValueException \
, except_code \
, value1 \
- , value2);
+ , value2);
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -110,10 +115,10 @@
int thisFacetsDefined = getFacetsDefined();
int result;
- try
+ try
{
- // must be < MaxExclusive
+ // must be < MaxExclusive
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
result = compareValues(theData, getMaxExclusive());
@@ -167,6 +172,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file AbstractNumericValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
Index: AbstractNumericValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractNumericValidator.hpp 1 Feb 2002 22:22:39 -0000 1.1
+++ AbstractNumericValidator.hpp 4 Nov 2002 14:53:27 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -75,6 +78,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLNumber.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractNumericValidator : public AbstractNumericFacetValidator
{
public:
@@ -122,7 +127,10 @@
AbstractNumericFacetValidator::init(enums);
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractNumericValidator.hpp
*/
-#endif
1.6 +7 -0 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractStringValidator.cpp 2 Oct 2002 13:29:12 -0000 1.5
+++ AbstractStringValidator.cpp 4 Nov 2002 14:53:27 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/10/02 13:29:12 tng
* Since the compare function return int, so use XMLString::compareString instead of XMLString::equals there.
*
@@ -112,6 +115,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -669,6 +674,8 @@
{
return getEnumeration();
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file AbstractStringValidator.cpp
1.4 +11 -2 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp
Index: AbstractStringValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractStringValidator.hpp 18 Oct 2002 16:52:14 -0000 1.3
+++ AbstractStringValidator.hpp 4 Nov 2002 14:53:27 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/18 16:52:14 peiyongz
* Patch to Bug#13640: Getter methods not public in
* DecimalDatatypeValidator
@@ -110,6 +113,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractStringValidator : public DatatypeValidator
{
public:
@@ -288,7 +293,10 @@
}
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractStringValidator.hpp
*/
-#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
Index: AnySimpleTypeDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnySimpleTypeDatatypeValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
+++ AnySimpleTypeDatatypeValidator.cpp 4 Nov 2002 14:53:27 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/14 15:17:31 peiyongz
* getEnumString()
*
@@ -76,6 +79,7 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// AnySimpleTypeDatatypeValidator: Constructors and Destructor
@@ -113,6 +117,8 @@
{
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file AnySimpleTypeDatatypeValidator.cpp
1.3 +4 -1 xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
Index: AnySimpleTypeDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnySimpleTypeDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
+++ AnySimpleTypeDatatypeValidator.hpp 4 Nov 2002 14:53:27 -0000 1.3
@@ -63,6 +63,7 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT AnySimpleTypeDatatypeValidator : public DatatypeValidator
{
@@ -190,6 +191,8 @@
{
return;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +21 -14 xml-xerces/c/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
Index: AnyURIDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnyURIDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ AnyURIDatatypeValidator.cpp 4 Nov 2002 14:53:27 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.10 2001/10/10 14:18:26 peiyongz
* no message
@@ -102,15 +105,17 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
//http://www.template.com
//
-static const XMLCh BASE_URI[] =
+static const XMLCh BASE_URI[] =
{
- chLatin_h, chLatin_t, chLatin_t, chLatin_p,
- chColon, chForwardSlash, chForwardSlash,
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p,
+ chColon, chForwardSlash, chForwardSlash,
chLatin_w, chLatin_w, chLatin_w, chPeriod,
- chLatin_t, chLatin_e, chLatin_m, chLatin_p, chLatin_l,
+ chLatin_t, chLatin_e, chLatin_m, chLatin_p, chLatin_l,
chLatin_a, chLatin_t, chLatin_e, chPeriod,
chLatin_c, chLatin_o, chLatin_m, chNull
};
@@ -141,7 +146,7 @@
init(enums);
}
catch (...)
- {
+ {
cleanUp();
throw;
}
@@ -182,24 +187,24 @@
}
void AnyURIDatatypeValidator::checkValueSpace(const XMLCh* const content)
-{
+{
// check 3.2.17.c0 must: URI (rfc 2396/2723)
- try
+ try
{
- if (!fTempURI)
+ if (!fTempURI)
fTempURI = new XMLUri(BASE_URI);
// Support for relative URLs
- // According to Java 1.1: URLs may also be specified with a
+ // According to Java 1.1: URLs may also be specified with a
// String and the URL object that it is related to.
//
- if (XMLString::stringLen(content))
+ if (XMLString::stringLen(content))
{
- XMLUri newURI(fTempURI, content );
+ XMLUri newURI(fTempURI, content );
}
- }
- catch (...)
+ }
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_URI_Malformed
@@ -207,6 +212,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file AnyURIDatatypeValidator.cpp
1.2 +26 -18 xml-xerces/c/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
Index: AnyURIDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnyURIDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ AnyURIDatatypeValidator.hpp 4 Nov 2002 14:53:27 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -96,6 +99,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
#include <xercesc/util/XMLUri.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AnyURIDatatypeValidator : public AbstractStringValidator
{
public:
@@ -109,8 +114,8 @@
AnyURIDatatypeValidator();
AnyURIDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~AnyURIDatatypeValidator();
@@ -150,9 +155,9 @@
// fTempURI
// to support relative URI, such as the urispec= "\sample"
//
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
- XMLUri *fTempURI;
+ XMLUri *fTempURI;
};
@@ -165,7 +170,10 @@
}
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AnyURIDatatypeValidator.hpp
*/
-#endif
1.2 +21 -14 xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp
Index: Base64BinaryDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Base64BinaryDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ Base64BinaryDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.12 2001/10/09 20:47:26 peiyongz
* init(): take 1 arg
@@ -106,6 +109,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/Base64.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -118,7 +123,7 @@
Base64BinaryDatatypeValidator::Base64BinaryDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::Base64Binary)
@@ -156,7 +161,7 @@
void Base64BinaryDatatypeValidator::checkValueSpace(const XMLCh* const content)
{
- if (getLength(content) <= 0)
+ if (getLength(content) <= 0)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_Not_Base64
@@ -168,6 +173,8 @@
{
return Base64::getDataLength(content);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file Base64BinaryDatatypeValidator.cpp
1.2 +25 -17 xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
Index: Base64BinaryDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Base64BinaryDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ Base64BinaryDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.6 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -73,6 +76,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT Base64BinaryDatatypeValidator : public AbstractStringValidator
{
public:
@@ -86,8 +91,8 @@
Base64BinaryDatatypeValidator();
Base64BinaryDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~Base64BinaryDatatypeValidator();
@@ -123,11 +128,14 @@
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file Base64BinaryDatatypeValidator.hpp
*/
-#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
Index: BooleanDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BooleanDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.4
+++ BooleanDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -99,6 +102,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const int ARRAYSIZE = 4;
const XMLCh fgValueSpace[][32] =
{
@@ -237,6 +242,8 @@
{
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file BooleanDatatypeValidator.cpp
1.3 +8 -2 xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
Index: BooleanDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
+++ BooleanDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -63,6 +63,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT BooleanDatatypeValidator : public DatatypeValidator
{
public:
@@ -183,7 +185,11 @@
checkContent(content, false);
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file BooleanDatatypeValidator.hpp
*/
-#endif
+
1.3 +9 -1 xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp
Index: DatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatatypeValidator.cpp 15 Oct 2002 18:04:31 -0000 1.2
+++ DatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/15 18:04:31 knoaman
* Bug [13485]: incorrect return from getWSstring
*
@@ -92,6 +95,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -125,11 +130,14 @@
return SchemaSymbols::fgWS_REPLACE;
case COLLAPSE:
return SchemaSymbols::fgWS_COLLAPSE;
- default:
+ default:
return SchemaSymbols::fgWS_PRESERVE;
}
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DatatypeValidator.cpp
*/
1.6 +5 -1 xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp
Index: DatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatatypeValidator.hpp 2 Oct 2002 13:29:12 -0000 1.5
+++ DatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.6
@@ -65,6 +65,8 @@
#include <xercesc/util/KVStringPair.hpp>
#include <xercesc/util/regx/RegularExpression.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* DataTypeValidator defines the interface that data type validators must
* obey. These validators can be supplied by the application writer and may
@@ -490,6 +492,8 @@
return true;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
Index: DatatypeValidatorFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatatypeValidatorFactory.cpp 8 May 2002 12:25:30 -0000 1.4
+++ DatatypeValidatorFactory.cpp 4 Nov 2002 14:53:28 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/08 12:25:30 tng
* Schema Fix: re-add the ID, IDREF ... datatype validators only if they were not there.
*
@@ -190,6 +193,8 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidatorFactory: Local const data
// ---------------------------------------------------------------------------
@@ -751,6 +756,8 @@
return datatypeValidator;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DatatypeValidatorFactory.cpp
1.4 +5 -1 xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
Index: DatatypeValidatorFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatatypeValidatorFactory.hpp 8 May 2002 12:25:30 -0000 1.3
+++ DatatypeValidatorFactory.hpp 4 Nov 2002 14:53:28 -0000 1.4
@@ -87,6 +87,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidatorFactory: Local declaration
// ---------------------------------------------------------------------------
@@ -257,6 +259,8 @@
delete fUserDefinedRegistry;
fUserDefinedRegistry = 0;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/DateDatatypeValidator.cpp
Index: DateDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ DateDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DateDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* DateDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DateDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DateDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
Index: DateDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ DateDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp
Index: DateTimeDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateTimeDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ DateTimeDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DateTimeDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* DateTimeDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DateTimeDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DateTimeDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
Index: DateTimeDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateTimeDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ DateTimeDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateTimeDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateTimeDatatypeValidator.hpp
*/
-#endif
1.2 +19 -12 xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp
Index: DateTimeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateTimeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DateTimeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/12 20:37:57 peiyongz
* SchemaDateTimeException defined
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -91,7 +96,7 @@
ThrowXML2(InvalidDatatypeValueException \
, except_code \
, value1 \
- , value2);
+ , value2);
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -118,7 +123,7 @@
, const XMLCh* const value2)
{
try
- {
+ {
XMLDateTime *pDate1 = parse(value1);
Janitor<XMLDateTime> jName1(pDate1);
XMLDateTime *pDate2 = parse(value2);
@@ -126,9 +131,9 @@
int result = compareDates(pDate1, pDate2, true);
return (result==INDETERMINATE)? -1 : result;
}
- catch (...) // RuntimeException e
+ catch (...) // RuntimeException e
{
- return -1; // revisit after implement compareDates()
+ return -1; // revisit after implement compareDates()
}
}
@@ -189,7 +194,7 @@
if (asBase)
return;
- try
+ try
{
// the derived classes' parse() method constructs an
// XMLDateTime object anc invokes appropriate XMLDateTime's
@@ -199,7 +204,7 @@
int result;
- // must be < MaxExclusive
+ // must be < MaxExclusive
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
result = compareValues(theDate, getMaxExclusive());
@@ -215,12 +220,12 @@
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
{
result = compareValues(theDate, getMaxInclusive());
- if ( result == XMLDateTime::GREATER_THAN || result == XMLDateTime::INDETERMINATE )
+ if ( result == XMLDateTime::GREATER_THAN || result == XMLDateTime::INDETERMINATE )
{
REPORT_VALUE_ERROR(theDate
, getMaxInclusive()
, XMLExcepts::VALUE_exceed_maxIncl)
- }
+ }
}
// must be >= MinInclusive
@@ -262,7 +267,7 @@
ThrowXML1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content);
}
}
- catch (...)
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content);
// new error message needed here
@@ -283,7 +288,7 @@
/**
* Compare algorithm described in dateDime (3.2.7).
* Duration datatype overwrites this method
- *
+ *
* @param date1 normalized date representation of the first value
* @param date2 normalized date representation of the second value
* @param strict
@@ -335,7 +340,7 @@
void DateTimeValidator::setEnumeration()
{
// to do: do we need to check against base value space???
-
+
if (!fStrEnumeration)
return;
@@ -347,6 +352,8 @@
fEnumeration->insertElementAt(parse(fStrEnumeration->elementAt(i)), i);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DateTimeValidator::cpp
1.2 +11 -3 xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.hpp
Index: DateTimeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateTimeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DateTimeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/12 20:37:57 peiyongz
* SchemaDateTimeException defined
@@ -74,6 +77,8 @@
#include <xercesc/validators/datatype/AbstractNumericFacetValidator.hpp>
#include <xercesc/util/XMLDateTime.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateTimeValidator : public AbstractNumericFacetValidator
{
public:
@@ -136,7 +141,7 @@
protected:
// -----------------------------------------------------------------------
- // helper interface: to be implemented/overwritten by derived class
+ // helper interface: to be implemented/overwritten by derived class
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const) = 0;
@@ -147,9 +152,12 @@
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateTimeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/DayDatatypeValidator.cpp
Index: DayDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DayDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DayDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DayDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DayDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* DayDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DayDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DayDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
Index: DayDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DayDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DayDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DayDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DayDatatypeValidator : public DateTimeValidator
{
public:
@@ -107,8 +112,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DayDatatypeValidator.hpp
*/
-#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
Index: DecimalDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DecimalDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.3
+++ DecimalDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -131,6 +134,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -549,6 +554,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DecimalDatatypeValidator::cpp
1.3 +11 -3 xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
Index: DecimalDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DecimalDatatypeValidator.hpp 17 Oct 2002 20:49:05 -0000 1.2
+++ DecimalDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/17 20:49:05 peiyongz
* Patch to Bug#13640: Getter methods not public in DecimalDatatypeValidator
*
@@ -84,6 +87,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLBigDecimal.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DecimalDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -143,7 +148,7 @@
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -228,7 +233,10 @@
fFractionDigits = newFractionDigits;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DecimalDatatypeValidator.hpp
*/
-#endif
1.2 +12 -5 xml-xerces/c/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
Index: DoubleDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DoubleDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DoubleDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -89,6 +92,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -208,7 +213,7 @@
{
numBase->checkContent(fStrEnumeration->elementAt(i), false);
}
- }
+ }
catch (XMLException&)
{
ThrowXML1(InvalidDatatypeFacetException
@@ -220,11 +225,11 @@
// We put the this->checkContent in a separate loop
// to not block original message with in that method.
- //
+ //
for ( i = 0; i < enumLength; i++)
{
checkContent(fStrEnumeration->elementAt(i), false);
- }
+ }
fEnumeration = new RefVectorOf<XMLNumber>(enumLength, true);
fEnumerationInherited = false;
@@ -232,7 +237,7 @@
for ( i = 0; i < enumLength; i++)
{
fEnumeration->insertElementAt(new XMLDouble(fStrEnumeration->elementAt(i)), i);
- }
+ }
}
// -----------------------------------------------------------------------
@@ -302,6 +307,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DoubleDatatypeValidator::cpp
1.2 +11 -3 xml-xerces/c/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
Index: DoubleDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DoubleDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DoubleDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/09 20:52:43 peiyongz
* init():removed
@@ -86,6 +89,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLDouble.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DoubleDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -145,7 +150,7 @@
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -176,7 +181,10 @@
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DoubleDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
Index: DurationDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DurationDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DurationDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DurationDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* DurationDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DurationDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -130,6 +135,8 @@
{
return XMLDateTime::compare(date1, date2, strict);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file DurationDatatypeValidator::cpp
1.2 +11 -3 xml-xerces/c/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
Index: DurationDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DurationDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ DurationDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DurationDatatypeValidator : public DateTimeValidator
{
public:
@@ -107,14 +112,17 @@
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const);
- virtual int compareDates(const XMLDateTime* const
+ virtual int compareDates(const XMLDateTime* const
, const XMLDateTime* const
, bool );
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DurationDatatypeValidator.hpp
*/
-#endif
1.3 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
Index: ENTITYDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ENTITYDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.2
+++ ENTITYDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -93,6 +96,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -173,6 +178,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ENTITYDatatypeValidator.cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
Index: ENTITYDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ENTITYDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ ENTITYDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.7 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -90,6 +93,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT ENTITYDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -197,7 +202,10 @@
fEntityDeclPool = entityDeclPool;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file ENTITYDatatypeValidator.hpp
*/
-#endif
1.2 +12 -5 xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
Index: FloatDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FloatDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ FloatDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -90,6 +93,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -209,7 +214,7 @@
{
numBase->checkContent(fStrEnumeration->elementAt(i), false);
}
- }
+ }
catch (XMLException&)
{
ThrowXML1(InvalidDatatypeFacetException
@@ -221,11 +226,11 @@
// We put the this->checkContent in a separate loop
// to not block original message with in that method.
- //
+ //
for ( i = 0; i < enumLength; i++)
{
checkContent(fStrEnumeration->elementAt(i), false);
- }
+ }
fEnumeration = new RefVectorOf<XMLNumber>(enumLength, true);
fEnumerationInherited = false;
@@ -233,7 +238,7 @@
for ( i = 0; i < enumLength; i++)
{
fEnumeration->insertElementAt(new XMLFloat(fStrEnumeration->elementAt(i)), i);
- }
+ }
}
// -----------------------------------------------------------------------
@@ -301,6 +306,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file FloatDatatypeValidator::cpp
1.2 +11 -3 xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
Index: FloatDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FloatDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ FloatDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/09 20:52:43 peiyongz
* init():removed
@@ -87,6 +90,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLFloat.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT FloatDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -146,7 +151,7 @@
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -177,7 +182,10 @@
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file FloatDatatypeValidator.hpp
*/
-#endif
1.2 +22 -15 xml-xerces/c/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
Index: HexBinaryDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HexBinaryDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ HexBinaryDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.12 2001/10/09 20:47:45 peiyongz
* init(): take 1 arg
@@ -106,6 +109,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/HexBin.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -118,8 +123,8 @@
HexBinaryDatatypeValidator::HexBinaryDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::HexBinary)
{
@@ -156,7 +161,7 @@
void HexBinaryDatatypeValidator::checkValueSpace(const XMLCh* const content)
{
- if (getLength(content) <= 0)
+ if (getLength(content) <= 0)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_Not_HexBin
@@ -168,6 +173,8 @@
{
return HexBin::getDataLength(content);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file HexBinaryDatatypeValidator.cpp
1.2 +25 -17 xml-xerces/c/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
Index: HexBinaryDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HexBinaryDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ HexBinaryDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -73,6 +76,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT HexBinaryDatatypeValidator : public AbstractStringValidator
{
public:
@@ -86,8 +91,8 @@
HexBinaryDatatypeValidator();
HexBinaryDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~HexBinaryDatatypeValidator();
@@ -124,10 +129,13 @@
// Private data members
//
// Nil.
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file HexBinaryDatatypeValidator.hpp
*/
-#endif
1.2 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/IDDatatypeValidator.cpp
Index: IDDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/IDDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ IDDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/09 20:50:02 peiyongz
* init(): take 1 arg
@@ -88,6 +91,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -179,6 +184,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IDDatatypeValidator.cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
Index: IDDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/IDDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ IDDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -96,6 +99,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT IDDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -176,7 +181,10 @@
fIDRefList = newIDRefList;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
/**
* End of file IDDatatypeValidator.hpp
*/
-#endif
+
1.2 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp
Index: IDREFDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDREFDatatypeValidator.cpp 1 Feb 2002 22:22:41 -0000 1.1
+++ IDREFDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/09 20:49:38 peiyongz
* init(): take 1 arg
@@ -86,6 +89,8 @@
#include <xercesc/validators/datatype/IDREFDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -173,6 +178,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file IDREFDatatypeValidator.cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
Index: IDREFDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDREFDatatypeValidator.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ IDREFDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -93,6 +96,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT IDREFDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -177,7 +182,10 @@
fIDRefList = newIDRefList;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file IDREFDatatypeValidator.hpp
*/
-#endif
1.2 +4 -1 xml-xerces/c/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp
Index: InvalidDatatypeFacetException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvalidDatatypeFacetException.hpp 1 Feb 2002 22:22:41 -0000 1.1
+++ InvalidDatatypeFacetException.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(InvalidDatatypeFacetException, XMLUTIL_EXPORT)
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +4 -1 xml-xerces/c/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp
Index: InvalidDatatypeValueException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvalidDatatypeValueException.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ InvalidDatatypeValueException.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(InvalidDatatypeValueException, XMLUTIL_EXPORT)
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
Index: ListDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.2
+++ ListDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -100,6 +103,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -446,6 +451,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ListDatatypeValidator.cpp
1.2 +12 -4 xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
Index: ListDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ ListDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.11 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -101,6 +104,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT ListDatatypeValidator : public AbstractStringValidator
{
public:
@@ -194,8 +199,8 @@
virtual int getLength(const XMLCh* const content) const;
- //
- // Overwrite AbstractStringValidator's
+ //
+ // Overwrite AbstractStringValidator's
//
virtual void inspectFacetBase();
@@ -249,7 +254,10 @@
fContent = content;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file ListDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp
Index: MonthDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ MonthDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/MonthDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* MonthDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* MonthDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file MonthDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
Index: MonthDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ MonthDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT MonthDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file MonthDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp
Index: MonthDayDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDayDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ MonthDayDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/MonthDayDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* MonthDayDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* MonthDayDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file MonthDayDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
Index: MonthDayDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDayDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ MonthDayDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT MonthDayDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file MonthDayDatatypeValidator.hpp
*/
-#endif
1.3 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
Index: NCNameDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NCNameDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.2
+++ NCNameDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -80,6 +83,8 @@
#include <xercesc/validators/datatype/NCNameDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -151,6 +156,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file NCNameDatatypeValidator.cpp
1.2 +11 -2 xml-xerces/c/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
Index: NCNameDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NCNameDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ NCNameDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/10/09 20:49:09 peiyongz
* init(): take 1 arg
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NCNameDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -162,7 +167,11 @@
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file NCNameDatatypeValidator.hpp
*/
-#endif
+
1.2 +24 -17 xml-xerces/c/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
Index: NOTATIONDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOTATIONDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ NOTATIONDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.10 2001/10/10 15:11:21 peiyongz
* extract/validate URI iff present
@@ -98,6 +101,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -110,7 +115,7 @@
NOTATIONDatatypeValidator::NOTATIONDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::NOTATION)
@@ -169,12 +174,12 @@
ArrayJanitor<XMLCh> jan1(uriPart);
XMLString::subString(uriPart, content, 0, colonPosition);
- try
+ try
{
// no relative uri support here
- XMLUri newURI(uriPart);
+ XMLUri newURI(uriPart);
}
- catch (...)
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_NOTATION_Invalid
@@ -200,6 +205,8 @@
{
return XMLString::stringLen(content);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file NOTATIONDatatypeValidator.cpp
1.2 +25 -17 xml-xerces/c/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
Index: NOTATIONDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOTATIONDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ NOTATIONDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.5 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -84,6 +87,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NOTATIONDatatypeValidator : public AbstractStringValidator
{
public:
@@ -97,8 +102,8 @@
NOTATIONDatatypeValidator();
NOTATIONDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~NOTATIONDatatypeValidator();
@@ -134,11 +139,14 @@
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
/**
* End of file NOTATIONDatatypeValidator.hpp
*/
-#endif
+
1.3 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
Index: NameDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NameDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NameDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.2
+++ NameDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -83,6 +86,8 @@
#include <xercesc/validators/datatype/NameDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -153,6 +158,8 @@
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file NameDatatypeValidator.cpp
1.2 +11 -2 xml-xerces/c/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
Index: NameDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/NameDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NameDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ NameDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/10/09 20:48:39 peiyongz
* init(): take 1 arg
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NameDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -162,7 +167,11 @@
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file NameDatatypeValidator.hpp
*/
-#endif
+
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
Index: QNameDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QNameDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ QNameDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.9 2001/10/09 20:47:05 peiyongz
* init(): take 1 arg
@@ -94,6 +97,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -159,7 +164,9 @@
{
return XMLString::stringLen(content);
}
-
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file QNameDatatypeValidator.cpp
*/
1.2 +25 -17 xml-xerces/c/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
Index: QNameDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QNameDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ QNameDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.5 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -84,6 +87,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT QNameDatatypeValidator : public AbstractStringValidator
{
public:
@@ -97,8 +102,8 @@
QNameDatatypeValidator();
QNameDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~QNameDatatypeValidator();
@@ -133,12 +138,15 @@
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file QNameDatatypeValidator.hpp
*/
-#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
Index: StringDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/StringDatatypeValidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.2
+++ StringDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -121,6 +124,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -280,6 +285,8 @@
{
return XMLString::stringLen(content);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file StringDatatypeValidator.cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
Index: StringDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/StringDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ StringDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.10 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -82,6 +85,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT StringDatatypeValidator : public AbstractStringValidator
{
public:
@@ -164,7 +169,10 @@
fWhiteSpace = newValue;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file StringDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp
Index: TimeDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ TimeDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/TimeDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* TimeDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* TimeDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file TimeDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
Index: TimeDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeDatatypeValidator.hpp 1 Feb 2002 22:22:42 -0000 1.1
+++ TimeDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -71,6 +74,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT TimeDatatypeValidator : public DateTimeValidator
{
public:
@@ -109,8 +114,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file TimeDatatypeValidator.hpp
*/
-#endif
1.4 +9 -1 xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
Index: UnionDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UnionDatatypeValidator.cpp 24 Sep 2002 19:44:40 -0000 1.3
+++ UnionDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -92,6 +95,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -395,6 +400,9 @@
{
return getEnumeration();
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file UnionDatatypeValidator.cpp
*/
1.3 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
Index: UnionDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnionDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
+++ UnionDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/14 15:17:31 peiyongz
* getEnumString()
*
@@ -96,6 +99,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT UnionDatatypeValidator : public DatatypeValidator
{
public:
@@ -328,7 +333,10 @@
return false;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file UnionDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/YearDatatypeValidator.cpp
Index: YearDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/YearDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearDatatypeValidator.cpp 1 Feb 2002 22:22:43 -0000 1.1
+++ YearDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/YearDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* YearDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* YearDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file YearDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
Index: YearDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/YearDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearDatatypeValidator.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ YearDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT YearDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file YearDatatypeValidator.hpp
*/
-#endif
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp
Index: YearMonthDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearMonthDatatypeValidator.cpp 1 Feb 2002 22:22:43 -0000 1.1
+++ YearMonthDatatypeValidator.cpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/YearMonthDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@
//
// caller need to release the date created here
//
-XMLDateTime* YearMonthDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* YearMonthDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -123,6 +128,8 @@
return pRetDate;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file YearMonthDatatypeValidator::cpp
1.2 +10 -2 xml-xerces/c/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
Index: YearMonthDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearMonthDatatypeValidator.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ YearMonthDatatypeValidator.hpp 4 Nov 2002 14:53:28 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT YearMonthDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file YearMonthDatatypeValidator.hpp
*/
-#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org