tng 2002/11/04 06:50:41
Modified: c/src/xercesc/validators/DTD DTDAttDef.cpp DTDAttDef.hpp
DTDAttDefList.cpp DTDAttDefList.hpp
DTDElementDecl.cpp DTDElementDecl.hpp
DTDEntityDecl.hpp DTDGrammar.cpp DTDGrammar.hpp
DTDScanner.cpp DTDScanner.hpp DTDValidator.cpp
DTDValidator.hpp DocTypeHandler.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.2 +19 -13 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.cpp
Index: DTDAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDAttDef.cpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDAttDef.cpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * 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:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:55:39 roddey
* This checkin includes many changes done while waiting for the
@@ -82,6 +85,7 @@
#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/validators/DTD/DTDAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDAttDef: Constructors and Destructor
@@ -130,3 +134,5 @@
delete [] fName;
fName = XMLString::replicate(newName);
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -13 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.hpp
Index: DTDAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDAttDef.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDAttDef.hpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * 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:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:16:48 abagchi
* Swat for removing Log from API docs
@@ -79,6 +82,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is a derivative of the core XMLAttDef class. This class adds
@@ -176,5 +180,7 @@
{
fElemId = newId;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -13 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp
Index: DTDAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDAttDefList.cpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDAttDefList.cpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * 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:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:55:39 roddey
* This checkin includes many changes done while waiting for the
@@ -81,6 +84,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDAttDefList: Constructors and Destructor
@@ -158,3 +162,5 @@
{
fEnum->Reset();
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -13 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp
Index: DTDAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDAttDefList.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDAttDefList.hpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * 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:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:16:48 abagchi
* Swat for removing Log from API docs
@@ -80,6 +83,7 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the framework abstract class which defines the
@@ -156,5 +160,7 @@
RefHashTableOfEnumerator<DTDAttDef>* fEnum;
RefHashTableOf<DTDAttDef>* fList;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +12 -9 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp
Index: DTDElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDElementDecl.cpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDElementDecl.cpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -73,6 +73,7 @@
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDElementDecl: Constructors and Destructor
@@ -83,8 +84,8 @@
, fAttList(0)
, fContentSpec(0)
, fModelType(Any)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
}
@@ -95,8 +96,8 @@
, fAttList(0)
, fContentSpec(0)
, fModelType(type)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
setElementName(elemRawName, uriId);
}
@@ -107,8 +108,8 @@
, fAttList(0)
, fContentSpec(0)
, fModelType(type)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
setElementName(elementName);
}
@@ -118,8 +119,8 @@
delete fAttDefs;
delete fAttList;
delete fContentSpec;
- delete fContentModel;
- delete [] fFormattedModel;
+ delete fContentModel;
+ delete [] fFormattedModel;
}
@@ -436,3 +437,5 @@
// Use a hash modulus of 29 and tell it owns its elements
((DTDElementDecl*)this)->fAttDefs = new RefHashTableOf<DTDAttDef>(29, true);
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +15 -8 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp
Index: DTDElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDElementDecl.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDElementDecl.hpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.12 2001/09/05 20:49:10 knoaman
* Fix for complexTypes with mixed content model.
@@ -110,6 +113,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/DTD/DTDAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class DTDAttDefList;
@@ -184,8 +189,8 @@
virtual ContentSpecNode* getContentSpec();
virtual void setContentSpec(ContentSpecNode* toAdopt);
virtual XMLContentModel* getContentModel();
- virtual void setContentModel(XMLContentModel* const newModelToAdopt);
- virtual const XMLCh* getFormattedContentModel () const;
+ virtual void setContentModel(XMLContentModel* const newModelToAdopt);
+ virtual const XMLCh* getFormattedContentModel () const;
// -----------------------------------------------------------------------
// Support keyed collections
@@ -215,10 +220,10 @@
// -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
- void faultInAttDefList() const;
+ void faultInAttDefList() const;
XMLContentModel* createChildModel() ;
XMLContentModel* makeContentModel() ;
- XMLCh* formatContentModel () const ;
+ XMLCh* formatContentModel () const ;
// -----------------------------------------------------------------------
@@ -247,19 +252,19 @@
//
// fContentModel
// The content model object for this element. It is stored here via
- // its abstract interface.
+ // its abstract interface.
//
// fFormattedModel
// This is a faulted in member. When the outside world asks for
// our content model as a string, we format it and fault it into
- // this field (to avoid doing the formatted over and over.)
+ // this field (to avoid doing the formatted over and over.)
// -----------------------------------------------------------------------
RefHashTableOf<DTDAttDef>* fAttDefs;
DTDAttDefList* fAttList;
ContentSpecNode* fContentSpec;
ModelTypes fModelType;
- XMLContentModel* fContentModel;
- XMLCh* fFormattedModel;
+ XMLContentModel* fContentModel;
+ XMLCh* fFormattedModel;
};
// ---------------------------------------------------------------------------
@@ -314,5 +319,7 @@
{
fModelType = toSet;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -13 xml-xerces/c/src/xercesc/validators/DTD/DTDEntityDecl.hpp
Index: DTDEntityDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDEntityDecl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDEntityDecl.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ DTDEntityDecl.hpp 4 Nov 2002 14:50:40 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * 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:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:16:49 abagchi
* Swat for removing Log from API docs
@@ -83,6 +86,7 @@
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the abstract version of an entity decl in the
@@ -247,5 +251,7 @@
{
fIsSpecialChar = newValue;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +8 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp
Index: DTDGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DTDGrammar.cpp 11 Jul 2002 18:19:28 -0000 1.2
+++ DTDGrammar.cpp 4 Nov 2002 14:50:40 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:19:28 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -84,6 +87,8 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local const data
//
@@ -204,4 +209,6 @@
fEntityDeclPool->put(new DTDEntityDecl(gGT, chCloseAngle, true, true));
fEntityDeclPool->put(new DTDEntityDecl(gQuot, chDoubleQuote, true, true));
fEntityDeclPool->put(new DTDEntityDecl(gApos, chSingleQuote, true, true));
-}
\ No newline at end of file
+}
+
+XERCES_CPP_NAMESPACE_END
1.5 +7 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp
Index: DTDGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDGrammar.hpp 22 Aug 2002 15:05:39 -0000 1.4
+++ DTDGrammar.hpp 4 Nov 2002 14:50:40 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/22 15:05:39 tng
* Remove unused parameter variables in inline functions.
*
@@ -97,6 +100,8 @@
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class stores the DTD information
// NOTE: DTDs are not namespace aware, so we just use regular NameIdPool
@@ -436,5 +441,7 @@
{
fValidated = newState;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.14 +7 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp
Index: DTDScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DTDScanner.cpp 24 Sep 2002 20:10:30 -0000 1.13
+++ DTDScanner.cpp 4 Nov 2002 14:50:40 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.13 2002/09/24 20:10:30 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -196,6 +199,8 @@
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local methods
// ---------------------------------------------------------------------------
@@ -3742,3 +3747,5 @@
fScanner->emitError(XMLErrs::ContradictoryEncoding,
bbEncoding.getRawBuffer());
}
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.hpp
Index: DTDScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DTDScanner.hpp 11 Jul 2002 18:39:48 -0000 1.3
+++ DTDScanner.hpp 4 Nov 2002 14:50:40 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/11 18:39:48 knoaman
* Access entities through the DTDGrammar instead of the scanner.
*
@@ -87,6 +90,8 @@
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Default implementation of an XML DTD scanner.
*/
@@ -338,5 +343,7 @@
inline bool DTDScanner::isReadingExternalEntity() {
return (fDocTypeReaderId != fReaderMgr->getCurrentReaderNum());
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.6 +5 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp
Index: DTDValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DTDValidator.cpp 24 Sep 2002 20:10:30 -0000 1.5
+++ DTDValidator.cpp 4 Nov 2002 14:50:40 -0000 1.6
@@ -69,6 +69,8 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/validators/DTD/DTDValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DTDValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -621,3 +623,5 @@
// validator.
//
}
+
+XERCES_CPP_NAMESPACE_END
1.5 +7 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.hpp
Index: DTDValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDValidator.hpp 4 Sep 2002 18:17:49 -0000 1.4
+++ DTDValidator.hpp 4 Nov 2002 14:50:40 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/04 18:17:49 tng
* Do not set IDREF to used during prevalidation.
*
@@ -128,6 +131,8 @@
#include <xercesc/framework/XMLValidator.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLMsgLoader;
@@ -239,5 +244,7 @@
// No Schema scanning
return false;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/validators/DTD/DocTypeHandler.hpp
Index: DocTypeHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DocTypeHandler.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocTypeHandler.hpp 14 Aug 2002 15:20:38 -0000 1.2
+++ DocTypeHandler.hpp 4 Nov 2002 14:50:40 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -95,6 +98,7 @@
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This abstract class defines the document type handler API's which can be
@@ -205,5 +209,7 @@
DocTypeHandler(const DocTypeHandler&);
void operator=(const DocTypeHandler&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
