tng 2002/11/04 06:54:59
Modified: c/src/xercesc/validators/common AllContentModel.cpp
AllContentModel.hpp CMAny.cpp CMAny.hpp
CMBinaryOp.cpp CMBinaryOp.hpp CMLeaf.hpp CMNode.hpp
CMStateSet.hpp CMUnaryOp.cpp CMUnaryOp.hpp
ContentLeafNameTypeVector.cpp
ContentLeafNameTypeVector.hpp ContentSpecNode.cpp
ContentSpecNode.hpp DFAContentModel.cpp
DFAContentModel.hpp Grammar.hpp GrammarResolver.cpp
GrammarResolver.hpp MixedContentModel.cpp
MixedContentModel.hpp SimpleContentModel.cpp
SimpleContentModel.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.3 +6 -0 xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp
Index: AllContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AllContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.2
+++ AllContentModel.cpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// AllContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -380,3 +385,4 @@
ThrowXML(RuntimeException, XMLExcepts::CM_UnknownCMSpecType);
}
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/AllContentModel.hpp
Index: AllContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/AllContentModel.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AllContentModel.hpp 1 Feb 2002 22:22:37 -0000 1.1
+++ AllContentModel.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -75,6 +78,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
//
@@ -191,6 +196,8 @@
return XMLContentModel::gInvalidTrans;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/CMAny.cpp
Index: CMAny.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMAny.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMAny.cpp 1 Feb 2002 22:22:37 -0000 1.1
+++ CMAny.cpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.6 2001/08/08 13:23:27 knoaman
* Fix condition check.
@@ -87,6 +90,8 @@
#include <xercesc/validators/common/CMStateSet.hpp>
#include <xercesc/validators/common/CMAny.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// CMUnaryOp: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -168,3 +173,5 @@
return;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/CMAny.hpp
Index: CMAny.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMAny.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMAny.hpp 1 Feb 2002 22:22:37 -0000 1.1
+++ CMAny.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:14 tng
* Copyright update.
@@ -73,6 +76,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/CMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMAny : public CMNode
@@ -132,5 +137,7 @@
unsigned int fURI;
unsigned int fPosition;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/validators/common/CMBinaryOp.cpp
Index: CMBinaryOp.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMBinaryOp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMBinaryOp.cpp 1 Feb 2002 22:22:37 -0000 1.1
+++ CMBinaryOp.cpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:15 tng
* Copyright update.
@@ -96,6 +99,7 @@
#include <xercesc/validators/common/CMBinaryOp.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// CMBinaryOp: Constructors
@@ -207,3 +211,5 @@
toSet |= fLeftChild->getLastPos();
}
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/CMBinaryOp.hpp
Index: CMBinaryOp.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMBinaryOp.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMBinaryOp.hpp 1 Feb 2002 22:22:37 -0000 1.1
+++ CMBinaryOp.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:16 tng
* Copyright update.
@@ -95,6 +98,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/CMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMBinaryOp : public CMNode
@@ -147,5 +152,7 @@
CMNode* fLeftChild;
CMNode* fRightChild;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/CMLeaf.hpp
Index: CMLeaf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMLeaf.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMLeaf.hpp 1 Feb 2002 22:22:37 -0000 1.1
+++ CMLeaf.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.6 2001/12/06 17:52:17 tng
* Performance Enhancement. The QName that was passed to the CMLeaf
@@ -117,6 +120,8 @@
#include <xercesc/validators/common/CMNode.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class represents a leaf in the content spec node tree of an
// element's content model. It just has an element qname and a position value,
@@ -310,5 +315,7 @@
// Otherwise, its just the one bit of our position
toSet.setBit(fPosition);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/validators/common/CMNode.hpp
Index: CMNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMNode.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMNode.hpp 1 Feb 2002 22:22:38 -0000 1.1
+++ CMNode.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -100,6 +103,7 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class CMNode
{
@@ -244,5 +248,7 @@
{
fMaxStates = maxStates;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/validators/common/CMStateSet.hpp
Index: CMStateSet.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMStateSet.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CMStateSet.hpp 16 Jul 2002 12:50:08 -0000 1.2
+++ CMStateSet.hpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/16 12:50:08 tng
* [Bug 10651] CMStateSet.hpp includes both memory.h and string.h.
*
@@ -114,6 +117,7 @@
#include <xercesc/framework/XMLValidityCodes.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
class CMStateSet
{
@@ -389,5 +393,7 @@
unsigned int fBits2;
XMLByte* fByteArray;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/validators/common/CMUnaryOp.cpp
Index: CMUnaryOp.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMUnaryOp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMUnaryOp.cpp 1 Feb 2002 22:22:38 -0000 1.1
+++ CMUnaryOp.cpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.4 2001/05/11 13:27:17 tng
* Copyright update.
@@ -98,6 +101,7 @@
#include <xercesc/validators/common/CMStateSet.hpp>
#include <xercesc/validators/common/CMUnaryOp.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// CMUnaryOp: Constructors and Destructor
@@ -162,3 +166,5 @@
// Its just based on our child node's last pos
toSet = fChild->getLastPos();
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/CMUnaryOp.hpp
Index: CMUnaryOp.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/CMUnaryOp.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMUnaryOp.hpp 1 Feb 2002 22:22:38 -0000 1.1
+++ CMUnaryOp.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -97,6 +100,8 @@
#include <xercesc/validators/common/CMNode.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMUnaryOp : public CMNode
@@ -144,5 +149,7 @@
// -----------------------------------------------------------------------
CMNode* fChild;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp
Index: ContentLeafNameTypeVector.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentLeafNameTypeVector.cpp 1 Feb 2002 22:22:38 -0000 1.1
+++ ContentLeafNameTypeVector.cpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -77,6 +80,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ContentLeafNameTypeVector: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -167,3 +172,5 @@
{
return fLeafCount;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0
xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp
Index: ContentLeafNameTypeVector.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentLeafNameTypeVector.hpp 1 Feb 2002 22:22:38 -0000 1.1
+++ ContentLeafNameTypeVector.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.4 2001/08/07 15:21:20 knoaman
* The value of 'fLeafCount' was not set.
@@ -81,6 +84,8 @@
#include <xercesc/util/ValueVectorOf.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentLeafNameTypeVector
{
public :
@@ -159,5 +164,7 @@
fLeafTypes = new ContentSpecNode::NodeTypes [size];
fLeafCount = size;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +5 -1 xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp
Index: ContentSpecNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentSpecNode.cpp 30 Oct 2002 21:52:00 -0000 1.4
+++ ContentSpecNode.cpp 4 Nov 2002 14:54:58 -0000 1.5
@@ -71,6 +71,8 @@
#include <xercesc/validators/DTD/DTDValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ContentSpecNode: Copy Constructor
//
@@ -300,4 +302,6 @@
return max;
}
+
+XERCES_CPP_NAMESPACE_END
1.5 +8 -1 xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.hpp
Index: ContentSpecNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentSpecNode.hpp 30 Oct 2002 21:52:00 -0000 1.4
+++ ContentSpecNode.hpp 4 Nov 2002 14:54:58 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/10/30 21:52:00 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right
thing.
*
@@ -155,8 +158,10 @@
#if !defined(CONTENTSPECNODE_HPP)
#define CONTENTSPECNODE_HPP
-#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/framework/XMLElementDecl.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLBuffer;
class Grammar;
@@ -524,5 +529,7 @@
return (fType == ContentSpecNode::All);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DFAContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.3
+++ DFAContentModel.cpp 4 Nov 2002 14:54:58 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -213,6 +216,8 @@
#include <xercesc/util/HashCMStateSet.hpp>
#include <xercesc/util/XMLInteger.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DFAContentModel: Constructors and Destructor
@@ -1273,4 +1278,6 @@
delete [] fConflictTable[i];
delete [] fConflictTable;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.hpp
Index: DFAContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DFAContentModel.hpp 1 Feb 2002 22:22:38 -0000 1.1
+++ DFAContentModel.hpp 4 Nov 2002 14:54:58 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.13 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -126,6 +129,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class CMLeaf;
class CMNode;
@@ -325,6 +330,8 @@
return fTransTable[currentState][elementIndex];
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/validators/common/Grammar.hpp
Index: Grammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/Grammar.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Grammar.hpp 11 Jul 2002 18:17:43 -0000 1.3
+++ Grammar.hpp 4 Nov 2002 14:54:58 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/11 18:17:43 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -94,6 +97,8 @@
#include <xercesc/framework/XMLEntityDecl.hpp>
#include <xercesc/framework/XMLNotationDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This abstract class specifies the interface for a Grammar
//
@@ -231,5 +236,7 @@
// -----------------------------------------------------------------------
Grammar() {};
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GrammarResolver.cpp 24 Sep 2002 19:48:39 -0000 1.4
+++ GrammarResolver.cpp 4 Nov 2002 14:54:58 -0000 1.5
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -91,6 +94,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// GrammarResolver: Constructor and Destructor
// ---------------------------------------------------------------------------
@@ -242,3 +247,5 @@
fGrammarRegistry->removeAll();
fGrammarRegistry->setAdoptElements(!fCacheGrammar);
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +5 -1 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp
Index: GrammarResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GrammarResolver.hpp 11 Jul 2002 18:17:43 -0000 1.2
+++ GrammarResolver.hpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -66,6 +66,8 @@
#include <xercesc/util/StringPool.hpp>
#include <xercesc/validators/common/Grammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DatatypeValidator;
class DatatypeValidatorFactory;
@@ -234,5 +236,7 @@
return fGrammarRegistry->orphanKey(nameSpaceKey);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.cpp
Index: MixedContentModel.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MixedContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.2
+++ MixedContentModel.cpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -138,6 +141,8 @@
#include <xercesc/validators/common/Grammar.hpp>
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// MixedContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -481,4 +486,6 @@
buildChildList(leftNode, toFill, toType);
}
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +8 -0 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MixedContentModel.hpp 25 Feb 2002 21:18:53 -0000 1.2
+++ MixedContentModel.hpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/25 21:18:53 tng
* Schema Fix: Ensure no invalid uri index for UPA checking.
*
@@ -121,6 +124,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
//
@@ -272,4 +277,7 @@
// for mixed content model, it's only a sequence
// UPA checking is not necessary
}
+
+XERCES_CPP_NAMESPACE_END
+
#endif
1.4 +6 -0
xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.3
+++ SimpleContentModel.cpp 4 Nov 2002 14:54:58 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -130,6 +133,7 @@
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SimpleContentModel: Implementation of the ContentModel virtual interface
@@ -533,4 +537,6 @@
fSecondChild->getRawName());
}
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +7 -0
xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.hpp
Index: SimpleContentModel.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleContentModel.hpp 30 Oct 2002 21:52:00 -0000 1.2
+++ SimpleContentModel.hpp 4 Nov 2002 14:54:58 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/30 21:52:00 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right
thing.
*
@@ -121,6 +124,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// SimpleContentModel is a derivative of the abstract content model base
// class that handles a small set of simple content models that are just
@@ -270,5 +275,7 @@
return XMLContentModel::gInvalidTrans;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
