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 16:00:23 UTC
cvs commit: xml-xerces/c/src/xercesc/framework LocalFileFormatTarget.cpp LocalFileFormatTarget.hpp LocalFileInputSource.cpp LocalFileInputSource.hpp MemBufFormatTarget.cpp MemBufFormatTarget.hpp MemBufInputSource.cpp MemBufInputSource.hpp StdInInputSource.cpp StdInInputSource.hpp StdOutFormatTarget.cpp StdOutFormatTarget.hpp URLInputSource.cpp URLInputSource.hpp Wrapper4DOMInputSource.cpp Wrapper4DOMInputSource.hpp Wrapper4InputSource.cpp Wrapper4InputSource.hpp XMLAttDef.cpp XMLAttDef.hpp XMLAttDefList.hpp XMLAttr.cpp XMLAttr.hpp XMLBuffer.cpp XMLBuffer.hpp XMLBufferMgr.cpp XMLBufferMgr.hpp XMLContentModel.cpp XMLContentModel.hpp XMLDocumentHandler.hpp XMLElementDecl.cpp XMLElementDecl.hpp XMLEntityDecl.cpp XMLEntityDecl.hpp XMLEntityHandler.hpp XMLErrorCodes.hpp XMLErrorReporter.hpp XMLFormatter.cpp XMLFormatter.hpp XMLNotationDecl.cpp XMLNotationDecl.hpp XMLPScanToken.hpp XMLRecognizer.cpp XMLRecognizer.hpp XMLRefInfo.hpp XMLValidator.cpp XMLValidator.hpp XMLValidityCodes.hpp
tng 2002/11/04 07:00:23
Modified: c/src/xercesc/framework LocalFileFormatTarget.cpp
LocalFileFormatTarget.hpp LocalFileInputSource.cpp
LocalFileInputSource.hpp MemBufFormatTarget.cpp
MemBufFormatTarget.hpp MemBufInputSource.cpp
MemBufInputSource.hpp StdInInputSource.cpp
StdInInputSource.hpp StdOutFormatTarget.cpp
StdOutFormatTarget.hpp URLInputSource.cpp
URLInputSource.hpp Wrapper4DOMInputSource.cpp
Wrapper4DOMInputSource.hpp Wrapper4InputSource.cpp
Wrapper4InputSource.hpp XMLAttDef.cpp XMLAttDef.hpp
XMLAttDefList.hpp XMLAttr.cpp XMLAttr.hpp
XMLBuffer.cpp XMLBuffer.hpp XMLBufferMgr.cpp
XMLBufferMgr.hpp XMLContentModel.cpp
XMLContentModel.hpp XMLDocumentHandler.hpp
XMLElementDecl.cpp XMLElementDecl.hpp
XMLEntityDecl.cpp XMLEntityDecl.hpp
XMLEntityHandler.hpp XMLErrorCodes.hpp
XMLErrorReporter.hpp XMLFormatter.cpp
XMLFormatter.hpp XMLNotationDecl.cpp
XMLNotationDecl.hpp XMLPScanToken.hpp
XMLRecognizer.cpp XMLRecognizer.hpp XMLRefInfo.hpp
XMLValidator.cpp XMLValidator.hpp
XMLValidityCodes.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.2 +9 -2 xml-xerces/c/src/xercesc/framework/LocalFileFormatTarget.cpp
Index: LocalFileFormatTarget.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/LocalFileFormatTarget.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalFileFormatTarget.cpp 19 Jun 2002 21:59:26 -0000 1.1
+++ LocalFileFormatTarget.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/06/19 21:59:26 peiyongz
* DOM3:DOMSave Interface support: LocalFileFormatTarget
*
@@ -66,6 +69,8 @@
#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/util/PlatformUtils.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
LocalFileFormatTarget::LocalFileFormatTarget(const XMLCh* const fileName)
:fSource(0)
{
@@ -95,5 +100,7 @@
return;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +10 -2 xml-xerces/c/src/xercesc/framework/LocalFileFormatTarget.hpp
Index: LocalFileFormatTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/LocalFileFormatTarget.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalFileFormatTarget.hpp 19 Jun 2002 21:59:26 -0000 1.1
+++ LocalFileFormatTarget.hpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/06/19 21:59:26 peiyongz
* DOM3:DOMSave Interface support: LocalFileFormatTarget
*
@@ -68,6 +71,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT LocalFileFormatTarget : public XMLFormatTarget {
public:
@@ -104,6 +109,9 @@
FileHandle fSource;
};
+
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +16 -12 xml-xerces/c/src/xercesc/framework/LocalFileInputSource.cpp
Index: LocalFileInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/LocalFileInputSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalFileInputSource.cpp 1 Feb 2002 22:21:50 -0000 1.1
+++ LocalFileInputSource.cpp 4 Nov 2002 15:00:21 -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
@@ -62,6 +62,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/framework/LocalFileInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// LocalFileInputSource: Constructors and Destructor
@@ -123,3 +124,6 @@
}
return retStrm;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/LocalFileInputSource.hpp
Index: LocalFileInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/LocalFileInputSource.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalFileInputSource.hpp 1 Feb 2002 22:21:50 -0000 1.1
+++ LocalFileInputSource.hpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.7 2001/10/13 04:21:53 jasons
* This patch resolves bug #2409: undocumented XMLException in LocalFileInputSource::new()
@@ -98,6 +101,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
/**
@@ -201,5 +206,7 @@
//@}
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +9 -1 xml-xerces/c/src/xercesc/framework/MemBufFormatTarget.cpp
Index: MemBufFormatTarget.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/MemBufFormatTarget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MemBufFormatTarget.cpp 12 Aug 2002 21:38:22 -0000 1.4
+++ MemBufFormatTarget.cpp 4 Nov 2002 15:00:21 -0000 1.5
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/12 21:38:22 peiyongz
* Bug#11462: MemBufFormatTarget issue(2) .., proposed patch from
* Esmond Pitt (pitte@anz.com)
@@ -76,6 +79,8 @@
#include <xercesc/util/XMLString.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
MemBufFormatTarget::MemBufFormatTarget(int initCapacity)
: fDataBuf(0)
, fIndex(0)
@@ -145,4 +150,6 @@
fDataBuf = newBuf;
fCapacity = newCap;
}
+
+XERCES_CPP_NAMESPACE_END
1.5 +12 -5 xml-xerces/c/src/xercesc/framework/MemBufFormatTarget.hpp
Index: MemBufFormatTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/MemBufFormatTarget.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MemBufFormatTarget.hpp 12 Aug 2002 21:38:22 -0000 1.4
+++ MemBufFormatTarget.hpp 4 Nov 2002 15:00:21 -0000 1.5
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/12 21:38:22 peiyongz
* Bug#11462: MemBufFormatTarget issue(2) .., proposed patch from
* Esmond Pitt (pitte@anz.com)
@@ -77,7 +80,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* The MemBufFormatTarget is a derivative from XMLFormatTarget, which user code
* may plug into DOMWriter to retrieve the serialized XML stream (from DOM Tree)
@@ -86,11 +90,11 @@
* The MemBufFormatTarget is initalized to have a memory buffer of 1023 upon
* construction, which grows as needed. The buffer will be deleted when
* MemBufFormatTarget is destructed; or will be reset when the reset() function
- * is called.
+ * is called.
*
* The MemBufFormatTarget returns a NULL terminated XMLByte stream upon request,
- * through the method getRawBuffer(), and user should make its own copy of the
- * returned buffer if it intends to keep it independent on the state of the
+ * through the method getRawBuffer(), and user should make its own copy of the
+ * returned buffer if it intends to keep it independent on the state of the
* MemBufFormatTarget.
*/
@@ -176,6 +180,8 @@
unsigned int fCapacity;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/MemBufInputSource.cpp
Index: MemBufInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/MemBufInputSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemBufInputSource.cpp 1 Feb 2002 22:21:50 -0000 1.1
+++ MemBufInputSource.cpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.2 2000/02/06 07:47:46 rahulj
* Year 2K copyright swat.
@@ -81,6 +84,7 @@
#include <xercesc/util/BinMemInputStream.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// MemBufInputSource: Constructors and Destructor
@@ -134,3 +138,6 @@
: BinMemInputStream::BufOpt_Reference
);
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/MemBufInputSource.hpp
Index: MemBufInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/MemBufInputSource.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemBufInputSource.hpp 20 Feb 2002 18:17:01 -0000 1.2
+++ MemBufInputSource.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -95,6 +98,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -270,5 +275,7 @@
{
fCopyBufToStream = newState;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/StdInInputSource.cpp
Index: StdInInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/StdInInputSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StdInInputSource.cpp 1 Feb 2002 22:21:50 -0000 1.1
+++ StdInInputSource.cpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.2 2000/02/06 07:47:46 rahulj
* Year 2K copyright swat.
@@ -82,6 +85,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/framework/StdInInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// StdInInputSource: Implementation of the input source interface
@@ -101,3 +105,6 @@
}
return retStream;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/StdInInputSource.hpp
Index: StdInInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/StdInInputSource.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StdInInputSource.hpp 1 Feb 2002 22:21:50 -0000 1.1
+++ StdInInputSource.hpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.6 2000/12/14 18:49:55 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
@@ -92,6 +95,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -159,5 +164,7 @@
inline StdInInputSource::~StdInInputSource()
{
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +9 -4 xml-xerces/c/src/xercesc/framework/StdOutFormatTarget.cpp
Index: StdOutFormatTarget.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/StdOutFormatTarget.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StdOutFormatTarget.cpp 28 May 2002 22:40:46 -0000 1.1
+++ StdOutFormatTarget.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/05/28 22:40:46 peiyongz
* DOM3 Save Interface: DOMWriter/DOMWriterFilter
*
@@ -65,6 +68,8 @@
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <iostream.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
StdOutFormatTarget::StdOutFormatTarget()
{}
@@ -73,7 +78,7 @@
void StdOutFormatTarget::writeChars(const XMLByte* const toWrite
, const unsigned int count
- , XMLFormatter* const formatter)
+ , XMLFormatter* const formatter)
{
// Surprisingly, Solaris was the only platform on which
// required the char* cast to print out the string correctly.
@@ -84,5 +89,5 @@
}
-
+XERCES_CPP_NAMESPACE_END
1.3 +8 -1 xml-xerces/c/src/xercesc/framework/StdOutFormatTarget.hpp
Index: StdOutFormatTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/StdOutFormatTarget.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StdOutFormatTarget.hpp 5 Jun 2002 15:47:29 -0000 1.2
+++ StdOutFormatTarget.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/06/05 15:47:29 peiyongz
* operator = modified
*
@@ -70,6 +73,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT StdOutFormatTarget : public XMLFormatTarget {
public:
@@ -93,5 +98,7 @@
StdOutFormatTarget(const StdOutFormatTarget&);
StdOutFormatTarget& operator=(const StdOutFormatTarget&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +22 -13 xml-xerces/c/src/xercesc/framework/URLInputSource.cpp
Index: URLInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/URLInputSource.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLInputSource.cpp 25 Apr 2002 00:12:34 -0000 1.2
+++ URLInputSource.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -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,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/25 00:12:34 jasons
* fairly serious error in the two XMLCh* constructor, the fURL member
* was being improperly initialized with the (systemID,publicID) instead
@@ -95,6 +98,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/URLInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// URLInputSource: Constructors and Destructor
@@ -108,7 +112,7 @@
URLInputSource::URLInputSource( const XMLCh* const baseId
, const XMLCh* const systemId) :
- fURL(baseId, systemId)
+ fURL(baseId, systemId)
{
// Create a URL that will build up the full URL and store as the system id
setSystemId(fURL.getURLText());
@@ -152,3 +156,6 @@
// Ask the URL to create us an appropriate input stream
return fURL.makeNewStream();
}
+
+XERCES_CPP_NAMESPACE_END
+
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/URLInputSource.hpp
Index: URLInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/URLInputSource.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLInputSource.hpp 1 Feb 2002 22:21:50 -0000 1.1
+++ URLInputSource.hpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.8 2000/12/14 18:49:56 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
@@ -103,6 +106,8 @@
#include <xercesc/util/XMLURL.hpp>
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
/**
@@ -279,5 +284,7 @@
{
return fURL;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/framework/Wrapper4DOMInputSource.cpp
Index: Wrapper4DOMInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/Wrapper4DOMInputSource.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Wrapper4DOMInputSource.cpp 19 Jul 2002 14:57:28 -0000 1.2
+++ Wrapper4DOMInputSource.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/19 14:57:28 knoaman
* Add an adoptFlag parameter to the constructor and remove the setter method.
* Documentation update.
@@ -73,6 +76,7 @@
#include <xercesc/dom/DOMInputSource.hpp>
#include <xercesc/util/NullPointerException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Wrapper4DOMInputSource: Constructor and Destructor
@@ -152,4 +156,5 @@
return fInputSource->makeStream();
}
+XERCES_CPP_NAMESPACE_END
1.3 +8 -4 xml-xerces/c/src/xercesc/framework/Wrapper4DOMInputSource.hpp
Index: Wrapper4DOMInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/Wrapper4DOMInputSource.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Wrapper4DOMInputSource.hpp 19 Jul 2002 14:57:28 -0000 1.2
+++ Wrapper4DOMInputSource.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -64,6 +64,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMInputSource;
@@ -78,11 +80,11 @@
/**
* Constructor
- *
+ *
* Wrap a DOMInputSource and pretend it to be a SAX InputSource.
* By default, the wrapper will adopt the DOMInputSource that is wrapped.
*
- * @param inputSource The DOMInputSource to be wrapped
+ * @param inputSource The DOMInputSource to be wrapped
* @param adoptFlag Indicates if the wrapper should adopt the wrapped
* DOMInputSource. Default is true.
*/
@@ -105,7 +107,7 @@
*
* Makes the byte stream for this input source.
*
- * <p>The function will call the makeStream of the wrapped input source.
+ * <p>The function will call the makeStream of the wrapped input source.
* The returned stream becomes the parser's property.</p>
*
* @see BinInputStream
@@ -260,6 +262,8 @@
bool fAdoptInputSource;
DOMInputSource* fInputSource;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/framework/Wrapper4InputSource.cpp
Index: Wrapper4InputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/Wrapper4InputSource.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Wrapper4InputSource.cpp 19 Jul 2002 14:57:28 -0000 1.3
+++ Wrapper4InputSource.cpp 4 Nov 2002 15:00:21 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/19 14:57:28 knoaman
* Add an adoptFlag parameter to the constructor and remove the setter method.
* Documentation update.
@@ -76,6 +79,7 @@
#include <xercesc/sax/InputSource.hpp>
#include <xercesc/util/NullPointerException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Wrapper4InputSource: Constructor and Destructor
@@ -163,4 +167,6 @@
Wrapper4InputSource* src = (Wrapper4InputSource*) this;
delete src;
}
+
+XERCES_CPP_NAMESPACE_END
1.5 +8 -4 xml-xerces/c/src/xercesc/framework/Wrapper4InputSource.hpp
Index: Wrapper4InputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/Wrapper4InputSource.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Wrapper4InputSource.hpp 22 Aug 2002 15:05:21 -0000 1.4
+++ Wrapper4InputSource.hpp 4 Nov 2002 15:00:21 -0000 1.5
@@ -64,6 +64,8 @@
#include <xercesc/dom/DOMInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
@@ -78,11 +80,11 @@
/**
* Constructor
- *
+ *
* Wrap a SAX InputSource and pretend it to be a DOMInputSource.
* By default, the wrapper will adopt the SAX InputSource that is wrapped.
*
- * @param inputSource The SAX InputSource to be wrapped
+ * @param inputSource The SAX InputSource to be wrapped
* @param adoptFlag Indicates if the wrapper should adopt the wrapped
* SAX InputSource. Default is true.
*/
@@ -105,7 +107,7 @@
*
* Makes the byte stream for this input source.
*
- * <p>The function will call the makeStream of the wrapped input source.
+ * <p>The function will call the makeStream of the wrapped input source.
* The returned stream becomes the parser's property.</p>
*
* @see BinInputStream
@@ -312,5 +314,7 @@
inline void Wrapper4InputSource::setBaseURI(const XMLCh* const)
{
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -1 xml-xerces/c/src/xercesc/framework/XMLAttDef.cpp
Index: XMLAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLAttDef.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLAttDef.cpp 1 Feb 2002 22:21:50 -0000 1.1
+++ XMLAttDef.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -67,6 +67,7 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local const data
@@ -200,3 +201,6 @@
delete [] fEnumeration;
delete [] fValue;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLAttDef.hpp
Index: XMLAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLAttDef.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLAttDef.hpp 20 Feb 2002 18:17:01 -0000 1.2
+++ XMLAttDef.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -112,6 +115,8 @@
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLAttr;
/** Represents the core information of an atribute definition
@@ -632,5 +637,7 @@
{
fExternalAttribute = aValue;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +18 -12 xml-xerces/c/src/xercesc/framework/XMLAttDefList.hpp
Index: XMLAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLAttDefList.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLAttDefList.hpp 1 Feb 2002 22:21:50 -0000 1.1
+++ XMLAttDefList.hpp 4 Nov 2002 15:00:21 -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:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:00:22 abagchi
* Swat for removing Log from API docs
@@ -83,6 +86,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class defines an abstract interface that all validators must support.
@@ -175,5 +179,7 @@
{
return *this;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -2 xml-xerces/c/src/xercesc/framework/XMLAttr.cpp
Index: XMLAttr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLAttr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLAttr.cpp 1 Feb 2002 22:21:50 -0000 1.1
+++ XMLAttr.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -67,7 +67,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttr.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLAttr: Constructors and Destructor
@@ -158,3 +158,6 @@
delete fAttName;
delete [] fValue;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +6 -0 xml-xerces/c/src/xercesc/framework/XMLAttr.hpp
Index: XMLAttr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLAttr.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLAttr.hpp 20 Feb 2002 18:17:01 -0000 1.2
+++ XMLAttr.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -104,6 +107,7 @@
#include <xercesc/util/QName.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class defines the information about an attribute that will come out
@@ -461,5 +465,7 @@
{
fSpecified = newValue;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +19 -12 xml-xerces/c/src/xercesc/framework/XMLBuffer.cpp
Index: XMLBuffer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLBuffer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLBuffer.cpp 13 Aug 2002 17:07:43 -0000 1.2
+++ XMLBuffer.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -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,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/13 17:07:43 peiyongz
* using 2 instead of 1.25 to expand capacity
*
@@ -93,6 +96,7 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLBuffer: Buffer management
@@ -156,3 +160,6 @@
fBuffer = newBuf;
fCapacity = newCap;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLBuffer.hpp
Index: XMLBuffer.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLBuffer.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLBuffer.hpp 21 Aug 2002 18:54:52 -0000 1.2
+++ XMLBuffer.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/21 18:54:52 tng
* [Bug 11869] Add the const modifier (XMLBuffer.hpp).
*
@@ -93,6 +96,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* XMLBuffer is a lightweight, expandable Unicode text buffer. Since XML is
* inherently theoretically unbounded in terms of the sizes of things, we
@@ -243,5 +248,7 @@
unsigned int fCapacity;
bool fUsed;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -13 xml-xerces/c/src/xercesc/framework/XMLBufferMgr.cpp
Index: XMLBufferMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLBufferMgr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLBufferMgr.cpp 1 Feb 2002 22:21:51 -0000 1.1
+++ XMLBufferMgr.cpp 4 Nov 2002 15:00:21 -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:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.4 2000/05/15 22:31:11 andyh
* Replace #include<memory.h> with <string.h> everywhere.
@@ -87,7 +90,7 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/framework/XMLBufferMgr.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -169,3 +172,6 @@
// It was not a legal buffer
ThrowXML(RuntimeException, XMLExcepts::BufMgr_BufferNotInPool);
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLBufferMgr.hpp
Index: XMLBufferMgr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLBufferMgr.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLBufferMgr.hpp 21 Aug 2002 18:54:52 -0000 1.2
+++ XMLBufferMgr.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/21 18:54:52 tng
* [Bug 11869] Add the const modifier (XMLBuffer.hpp).
*
@@ -91,6 +94,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLBufBid;
/**
@@ -237,5 +242,7 @@
XMLBuffer& fBuffer;
XMLBufferMgr* const fMgr;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/framework/XMLContentModel.cpp
Index: XMLContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLContentModel.cpp 1 Feb 2002 22:21:51 -0000 1.1
+++ XMLContentModel.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/28 20:53:35 tng
* Schema: move static data gInvalidTrans, gEOCFakeId, gEpsilonFakeId to XMLContentModel for others to access
@@ -79,10 +82,14 @@
// ---------------------------------------------------------------------------
#include <xercesc/framework/XMLContentModel.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// public static data
// ---------------------------------------------------------------------------
const unsigned int XMLContentModel::gInvalidTrans = 0xFFFFFFFF;
const unsigned int XMLContentModel::gEOCFakeId = 0xFFFFFFF1;
const unsigned int XMLContentModel::gEpsilonFakeId = 0xFFFFFFF2;
+
+XERCES_CPP_NAMESPACE_END
1.2 +7 -0 xml-xerces/c/src/xercesc/framework/XMLContentModel.hpp
Index: XMLContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLContentModel.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLContentModel.hpp 1 Feb 2002 22:21:51 -0000 1.1
+++ XMLContentModel.hpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.14 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -116,6 +119,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/QName.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentLeafNameTypeVector;
class GrammarResolver;
class XMLStringPool;
@@ -214,5 +219,7 @@
XMLContentModel(const XMLContentModel&);
void operator=(const XMLContentModel&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/framework/XMLDocumentHandler.hpp
Index: XMLDocumentHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLDocumentHandler.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDocumentHandler.hpp 28 May 2002 20:41:11 -0000 1.3
+++ XMLDocumentHandler.hpp 4 Nov 2002 15:00:21 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/28 20:41:11 tng
* [Bug 9104] prefixes dissapearing when schema validation turned on.
*
@@ -104,6 +107,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/framework/XMLAttr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLElementDecl;
class XMLEntityDecl;
@@ -352,5 +357,7 @@
XMLDocumentHandler(const XMLDocumentHandler&);
void operator=(const XMLDocumentHandler&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -1 xml-xerces/c/src/xercesc/framework/XMLElementDecl.cpp
Index: XMLElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLElementDecl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLElementDecl.cpp 30 Oct 2002 21:52:00 -0000 1.2
+++ XMLElementDecl.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -66,6 +66,8 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/XMLElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLElementDecl: Public, static data
// ---------------------------------------------------------------------------
@@ -125,3 +127,6 @@
, fExternalElement (false)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLElementDecl.hpp
Index: XMLElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLElementDecl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLElementDecl.hpp 20 Aug 2002 16:55:33 -0000 1.2
+++ XMLElementDecl.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/20 16:55:33 tng
* [Bug 6251] Info during compilation.
*
@@ -131,6 +134,8 @@
#include <xercesc/framework/XMLAttr.hpp>
#include <xercesc/framework/XMLAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class XMLContentModel;
@@ -667,5 +672,7 @@
{
fExternalElement = aValue;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +5 -1 xml-xerces/c/src/xercesc/framework/XMLEntityDecl.cpp
Index: XMLEntityDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLEntityDecl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLEntityDecl.cpp 22 Aug 2002 19:27:41 -0000 1.2
+++ XMLEntityDecl.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -67,6 +67,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLEntityDecl: Constructors and Destructor
@@ -174,3 +175,6 @@
delete [] fSystemId;
delete [] fBaseURI;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLEntityDecl.hpp
Index: XMLEntityDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLEntityDecl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLEntityDecl.hpp 22 Aug 2002 19:27:41 -0000 1.2
+++ XMLEntityDecl.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -90,6 +93,8 @@
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class defines that core information that defines an XML entity, no
* matter what validator is used. Each validator will create a derivative
@@ -518,5 +523,7 @@
{
return fName;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/framework/XMLEntityHandler.hpp
Index: XMLEntityHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLEntityHandler.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLEntityHandler.hpp 6 Jun 2002 20:41:51 -0000 1.4
+++ XMLEntityHandler.hpp 4 Nov 2002 15:00:21 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/06/06 20:41:51 tng
* Regression fix: should assign the returned InputSource from resolveEntity to srcToFill.
*
@@ -103,6 +106,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class XMLBuffer;
@@ -232,5 +237,7 @@
XMLEntityHandler(const XMLEntityHandler&);
void operator=(const XMLEntityHandler&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.6 +6 -0 xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp
Index: XMLErrorCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLErrorCodes.hpp 19 Aug 2002 13:46:31 -0000 1.5
+++ XMLErrorCodes.hpp 4 Nov 2002 15:00:21 -0000 1.6
@@ -4,6 +4,9 @@
#define ERRHEADER_XMLErrs
#include <xercesc/framework/XMLErrorReporter.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLErrs
{
@@ -329,5 +332,8 @@
return XMLErrorReporter::ErrTypes_Unknown;
}
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/framework/XMLErrorReporter.hpp
Index: XMLErrorReporter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLErrorReporter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLErrorReporter.hpp 27 May 2002 18:34:59 -0000 1.3
+++ XMLErrorReporter.hpp 4 Nov 2002 15:00:21 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/27 18:34:59 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -114,6 +117,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This abstract class defines a callback mechanism for the scanner. By
@@ -244,5 +249,7 @@
XMLErrorReporter(const XMLErrorReporter&);
void operator=(const XMLErrorReporter&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +5 -2 xml-xerces/c/src/xercesc/framework/XMLFormatter.cpp
Index: XMLFormatter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLFormatter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLFormatter.cpp 17 Oct 2002 16:02:04 -0000 1.4
+++ XMLFormatter.cpp 4 Nov 2002 15:00:21 -0000 1.5
@@ -71,6 +71,7 @@
#include <xercesc/framework/XMLFormatter.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local data
@@ -364,7 +365,7 @@
const unsigned srcChars = srcCount > kTmpBufSize ?
kTmpBufSize : srcCount;
-
+
const unsigned int outBytes = fXCoder->transcodeTo
(
srcPtr
@@ -678,4 +679,6 @@
}
}
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +6 -0 xml-xerces/c/src/xercesc/framework/XMLFormatter.hpp
Index: XMLFormatter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLFormatter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLFormatter.hpp 30 Jul 2002 16:29:16 -0000 1.3
+++ XMLFormatter.hpp 4 Nov 2002 15:00:21 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/30 16:29:16 tng
* [Bug 8550] No explanation of XMLFormatter escape options.
*
@@ -102,6 +105,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLFormatTarget;
class XMLTranscoder;
@@ -519,5 +524,6 @@
return *this;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/framework/XMLNotationDecl.cpp
Index: XMLNotationDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLNotationDecl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLNotationDecl.cpp 22 Aug 2002 19:27:41 -0000 1.2
+++ XMLNotationDecl.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -79,6 +82,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/framework/XMLNotationDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLNotationDecl: Constructors and operators
@@ -144,3 +148,5 @@
delete [] fSystemId;
delete [] fBaseURI;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +7 -0 xml-xerces/c/src/xercesc/framework/XMLNotationDecl.hpp
Index: XMLNotationDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLNotationDecl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLNotationDecl.hpp 22 Aug 2002 19:27:41 -0000 1.2
+++ XMLNotationDecl.hpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -90,6 +93,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class represents the core information about a notation declaration
* that all validators must at least support. Each validator will create a
@@ -257,5 +262,7 @@
{
return fName;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +21 -12 xml-xerces/c/src/xercesc/framework/XMLPScanToken.hpp
Index: XMLPScanToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLPScanToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLPScanToken.hpp 1 Feb 2002 22:21:52 -0000 1.1
+++ XMLPScanToken.hpp 4 Nov 2002 15:00:21 -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:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:00:23 abagchi
* Swat for removing Log from API docs
@@ -80,6 +83,10 @@
#if !defined(XMLPSCANTOKEN_HPP)
#define XMLPSCANTOKEN_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLScanner;
/**
@@ -199,5 +206,7 @@
fScannerId = scannerId;
fSequenceId = sequenceId;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +4 -1 xml-xerces/c/src/xercesc/framework/XMLRecognizer.cpp
Index: XMLRecognizer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLRecognizer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLRecognizer.cpp 16 Jul 2002 13:01:12 -0000 1.2
+++ XMLRecognizer.cpp 4 Nov 2002 15:00:21 -0000 1.3
@@ -68,6 +68,7 @@
#include <xercesc/framework/XMLRecognizer.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local data
@@ -260,3 +261,5 @@
return gEncodingNameMap[theEncoding];
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -13 xml-xerces/c/src/xercesc/framework/XMLRecognizer.hpp
Index: XMLRecognizer.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLRecognizer.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLRecognizer.hpp 1 Feb 2002 22:21:52 -0000 1.1
+++ XMLRecognizer.hpp 4 Nov 2002 15:00:21 -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
@@ -61,6 +61,10 @@
#if !defined(XMLRECOGNIZER_HPP)
#define XMLRECOGNIZER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class provides some simple code to recognize the encodings of
* XML files. This recognition only does very basic sensing of the encoding
@@ -168,5 +172,7 @@
~XMLRecognizer();
void operator=(const XMLRecognizer&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +19 -12 xml-xerces/c/src/xercesc/framework/XMLRefInfo.hpp
Index: XMLRefInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLRefInfo.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLRefInfo.hpp 1 Feb 2002 22:21:52 -0000 1.1
+++ XMLRefInfo.hpp 4 Nov 2002 15:00:21 -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:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.5 2000/07/07 22:23:38 jpolast
* remove useless getKey() functions.
@@ -83,6 +86,9 @@
#if !defined(XMLIDREFINFO_HPP)
#define XMLIDREFINFO_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class provides a simple means to track ID Ref usage. Since id/idref
@@ -216,5 +222,6 @@
fUsed = newValue;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -1 xml-xerces/c/src/xercesc/framework/XMLValidator.cpp
Index: XMLValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLValidator.cpp 1 Feb 2002 22:21:52 -0000 1.1
+++ XMLValidator.cpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.13 2001/11/30 22:18:18 peiyongz
* cleanUp function made member function
@@ -126,6 +129,7 @@
#include <xercesc/framework/XMLValidator.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static functions
@@ -165,7 +169,7 @@
// Lock the mutex
XMLMutexLock lockInit(&gValidatorMutex());
-
+
if (!sMsgLoader)
{
sMsgLoader = XMLPlatformUtils::loadMsgSet(XMLUni::fgValidityDomain);
@@ -390,3 +394,5 @@
delete sMsgLoader;
sMsgLoader = 0;
}
+
+XERCES_CPP_NAMESPACE_END
1.6 +6 -0 xml-xerces/c/src/xercesc/framework/XMLValidator.hpp
Index: XMLValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLValidator.hpp 4 Sep 2002 18:17:55 -0000 1.5
+++ XMLValidator.hpp 4 Nov 2002 15:00:21 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/09/04 18:17:55 tng
* Do not set IDREF to used during prevalidation.
*
@@ -143,6 +146,8 @@
#include <xercesc/framework/XMLValidityCodes.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ReaderMgr;
class XMLBuffer;
class XMLBufferMgr;
@@ -547,5 +552,6 @@
return fScanner;
}
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +6 -0 xml-xerces/c/src/xercesc/framework/XMLValidityCodes.hpp
Index: XMLValidityCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLValidityCodes.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLValidityCodes.hpp 1 Feb 2002 22:21:52 -0000 1.1
+++ XMLValidityCodes.hpp 4 Nov 2002 15:00:21 -0000 1.2
@@ -4,6 +4,9 @@
#define ERRHEADER_XMLValid
#include <xercesc/framework/XMLErrorReporter.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLValid
{
@@ -150,5 +153,8 @@
return XMLErrorReporter::ErrTypes_Unknown;
}
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org