tng 2002/11/04 06:58:20
Modified: c/src/xercesc/internal CharTypeTables.hpp ElemStack.cpp
ElemStack.hpp EndOfEntityException.hpp
IANAEncodings.hpp ReaderMgr.cpp ReaderMgr.hpp
VecAttrListImpl.cpp VecAttrListImpl.hpp
VecAttributesImpl.cpp VecAttributesImpl.hpp
XMLInternalErrorHandler.hpp XMLReader.cpp
XMLReader.hpp XMLScanner.cpp XMLScanner.hpp
XMLScanner2.cpp
Log:
C++ Namespace Support.
Revision Changes Path
1.2 +13 -0 xml-xerces/c/src/xercesc/internal/CharTypeTables.hpp
Index: CharTypeTables.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/CharTypeTables.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharTypeTables.hpp 1 Feb 2002 22:21:57 -0000 1.1
+++ CharTypeTables.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:57 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:57 peiyongz
+ * sane_include
*
* Revision 1.4 2001/07/26 19:53:02 tng
* [Bug 2751] Several NameChar characters missing from internal tables .
@@ -76,6 +79,12 @@
*
*/
+#if !defined(CHARTYPETABLES_HPP)
+#define CHARTYPETABLES_HPP
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// These are character type lookup tables. They are included into XMLReader
@@ -254,3 +263,7 @@
, 0x0009, 0x000D, 0x000A
, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/internal/ElemStack.cpp
Index: ElemStack.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ElemStack.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElemStack.cpp 1 Feb 2002 22:21:57 -0000 1.1
+++ ElemStack.cpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:57 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:57 peiyongz
+ * sane_include
*
* Revision 1.17 2001/12/12 14:29:50 tng
* Remove obsolete code in ElemStack which can help performance.
@@ -129,6 +132,7 @@
#include <xercesc/internal/ElemStack.hpp>
#include <xercesc/validators/common/Grammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// ElemStack: Constructors and Destructor
@@ -524,3 +528,5 @@
fStack = newStack;
fStackCapacity = newCapacity;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +8 -0 xml-xerces/c/src/xercesc/internal/ElemStack.hpp
Index: ElemStack.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ElemStack.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElemStack.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ ElemStack.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.11 2001/12/12 14:29:50 tng
* Remove obsolete code in ElemStack which can help performance.
@@ -105,6 +108,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/StringPool.hpp>
#include <xercesc/util/QName.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLElementDecl;
class Grammar;
@@ -381,5 +387,7 @@
fStack[fStackTop-1]->fCurrentURI = uri;
return;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +21 -12 xml-xerces/c/src/xercesc/internal/EndOfEntityException.hpp
Index: EndOfEntityException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/EndOfEntityException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EndOfEntityException.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ EndOfEntityException.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 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
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:18:07 abagchi
* Swat for removing Log from API docs
@@ -77,6 +80,10 @@
#if !defined(ENDOFENTITYEXCEPTION_HPP)
#define ENDOFENTITYEXCEPTION_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLEntityDecl;
//
@@ -156,5 +163,7 @@
{
return fReaderNum;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +12 -1 xml-xerces/c/src/xercesc/internal/IANAEncodings.hpp
Index: IANAEncodings.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IANAEncodings.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IANAEncodings.hpp 18 Jul 2002 20:09:13 -0000 1.1
+++ IANAEncodings.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -1,9 +1,16 @@
+#if !defined(IANAENCODINGS_HPP)
+#define IANAENCODINGS_HPP
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
// ----------------------------------------------------------------
// This file was generated from the IANA charset source.
// so do not edit this file directly!!
// ----------------------------------------------------------------
-const XMLCh gEncodingArray[][128] =
+const XMLCh gEncodingArray[][128] =
{
{
0x0041,0x004E,0x0053,0x0049,0x005F,0x0058,0x0033,0x002E,0x0034,0x002D,0x0031,0x0039,0x0036,0x0038,0x00
}
, { 0x0069,0x0073,0x006F,0x002D,0x0069,0x0072,0x002D,0x0036,0x00 }
@@ -799,4 +806,8 @@
};
const unsigned int gEncodingArraySize = 791;
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
1.6 +5 -1 xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ReaderMgr.cpp 24 Sep 2002 20:02:20 -0000 1.5
+++ ReaderMgr.cpp 4 Nov 2002 14:58:18 -0000 1.6
@@ -79,6 +79,8 @@
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/internal/ReaderMgr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ReaderMgr: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1074,3 +1076,5 @@
}
return true;
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +7 -0 xml-xerces/c/src/xercesc/internal/ReaderMgr.hpp
Index: ReaderMgr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReaderMgr.hpp 22 Aug 2002 19:28:11 -0000 1.3
+++ ReaderMgr.hpp 4 Nov 2002 14:58:18 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/08/22 19:28:11 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -133,6 +136,8 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/internal/XMLReader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLBuffer;
class XMLEntityDecl;
class XMLEntityHandler;
@@ -479,5 +484,7 @@
bool fOld;
ReaderMgr* fMgr;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +6 -0 xml-xerces/c/src/xercesc/internal/VecAttrListImpl.cpp
Index: VecAttrListImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttrListImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VecAttrListImpl.cpp 24 Sep 2002 20:02:20 -0000 1.4
+++ VecAttrListImpl.cpp 4 Nov 2002 14:58:18 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 20:02:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -103,6 +106,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/internal/VecAttrListImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -231,3 +235,5 @@
fCount = count;
fVector = srcVec;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -12 xml-xerces/c/src/xercesc/internal/VecAttrListImpl.hpp
Index: VecAttrListImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttrListImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VecAttrListImpl.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ VecAttrListImpl.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 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
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:18:07 abagchi
* Swat for removing Log from API docs
@@ -85,6 +88,8 @@
#include <xercesc/framework/XMLAttr.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT VecAttrListImpl : public AttributeList
{
public :
@@ -147,5 +152,7 @@
unsigned int fCount;
const RefVectorOf<XMLAttr>* fVector;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +5 -0 xml-xerces/c/src/xercesc/internal/VecAttributesImpl.cpp
Index: VecAttributesImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttributesImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VecAttributesImpl.cpp 24 Sep 2002 20:02:20 -0000 1.2
+++ VecAttributesImpl.cpp 4 Nov 2002 14:58:18 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 20:02:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -96,6 +99,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/internal/VecAttributesImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -260,3 +264,4 @@
fScanner = scanner ;
}
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/internal/VecAttributesImpl.hpp
Index: VecAttributesImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttributesImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VecAttributesImpl.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ VecAttributesImpl.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.5 2001/05/11 13:26:16 tng
* Copyright update.
@@ -89,6 +92,8 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT VecAttributesImpl : public Attributes
{
public :
@@ -169,5 +174,7 @@
const XMLScanner * fScanner ;
//XMLBuffer fURIBuffer ;
};
+
+XERCES_CPP_NAMESPACE_END
#endif // ! VECATTRIBUTESIMPL_HPP
1.2 +12 -1 xml-xerces/c/src/xercesc/internal/XMLInternalErrorHandler.hpp
Index: XMLInternalErrorHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLInternalErrorHandler.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLInternalErrorHandler.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ XMLInternalErrorHandler.hpp 4 Nov 2002 14:58:18 -0000 1.2
@@ -1,4 +1,3 @@
-
/*
* The Apache Software License, Version 1.1
*
@@ -57,17 +56,25 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.1 2001/07/26 17:04:10 tng
* Schema: Process should stop after fatal error, and user throws need to be
rethrown.
*
*/
+#if !defined(XMLINTERNALERRORHANDLER_HPP)
+#define XMLINTERNALERRORHANDLER_HPP
+
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/sax/ErrorHandler.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLInternalErrorHandler : public ErrorHandler
{
public:
@@ -167,3 +174,7 @@
fSawError = false;
fSawFatal = false;
}
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
1.5 +4 -1 xml-xerces/c/src/xercesc/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLReader.cpp 13 Aug 2002 20:29:07 -0000 1.4
+++ XMLReader.cpp 4 Nov 2002 14:58:18 -0000 1.5
@@ -78,6 +78,7 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLReader: static data initialization
@@ -5911,3 +5912,5 @@
, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48,
0x48, 0x48, 0x48
, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48,
0x48, 0x00, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
1.4 +7 -0 xml-xerces/c/src/xercesc/internal/XMLReader.hpp
Index: XMLReader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLReader.hpp 27 Sep 2002 12:56:23 -0000 1.3
+++ XMLReader.hpp 4 Nov 2002 14:58:19 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:58:19 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/27 12:56:23 tng
* [Bug 12740] Extra include. By Peter Volchek.
*
@@ -140,6 +143,8 @@
#include <xercesc/framework/XMLRecognizer.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class BinInputStream;
class ReaderMgr;
@@ -831,5 +836,7 @@
}
return true;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.23 +6 -2 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLScanner.cpp 24 Sep 2002 20:02:20 -0000 1.22
+++ XMLScanner.cpp 4 Nov 2002 14:58:19 -0000 1.23
@@ -94,6 +94,8 @@
#include <xercesc/validators/schema/identity/IC_Selector.hpp>
#include <xercesc/validators/schema/identity/ValueStore.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static data
// ---------------------------------------------------------------------------
@@ -4557,4 +4559,6 @@
void XMLScanner::resetCachedGrammarPool()
{
fGrammarResolver->resetCachedGrammar();
-}
\ No newline at end of file
+}
+
+XERCES_CPP_NAMESPACE_END
1.12 +7 -0 xml-xerces/c/src/xercesc/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLScanner.hpp 27 Aug 2002 05:56:39 -0000 1.11
+++ XMLScanner.hpp 4 Nov 2002 14:58:19 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2002/11/04 14:58:19 tng
+ * C++ Namespace Support.
+ *
* Revision 1.11 2002/08/27 05:56:39 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -247,6 +250,8 @@
#include <xercesc/validators/DTD/DTDValidator.hpp>
#include <xercesc/validators/schema/SchemaValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class XMLDocumentHandler;
class DocTypeHandler;
@@ -1404,5 +1409,7 @@
else
fValScheme = Val_Never;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.17 +5 -2 xml-xerces/c/src/xercesc/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner2.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLScanner2.cpp 15 Oct 2002 18:41:48 -0000 1.16
+++ XMLScanner2.cpp 4 Nov 2002 14:58:19 -0000 1.17
@@ -96,6 +96,7 @@
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
#include <xercesc/validators/schema/XSDDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLScanner: Private helper methods
@@ -3216,10 +3217,12 @@
}
else if (*pszSrc == 0xFFFF) { //escaped character
pszSrc++;
- }
+ }
else {
normalizedURI.append(*pszSrc);
pszSrc++;
}
}
}
+
+XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
