Author: amassari
Date: Sun Mar 19 06:29:49 2006
New Revision: 386972
URL: http://svn.apache.org/viewcvs?rev=386972&view=rev
Log:
Factory method is no more inline to avoid including an internal header in a
public one (jira#1579)
Modified:
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
xerces/c/trunk/src/xercesc/sax2/XMLReaderFactory.hpp
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=386972&r1=386971&r2=386972&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Sun Mar 19
06:29:49 2006
@@ -25,6 +25,7 @@
#include <xercesc/sax2/ContentHandler.hpp>
#include <xercesc/sax2/LexicalHandler.hpp>
#include <xercesc/sax2/DeclHandler.hpp>
+#include <xercesc/sax2/XMLReaderFactory.hpp>
#include <xercesc/sax/DTDHandler.hpp>
#include <xercesc/sax/ErrorHandler.hpp>
#include <xercesc/sax/EntityResolver.hpp>
@@ -40,6 +41,14 @@
#include <string.h>
XERCES_CPP_NAMESPACE_BEGIN
+
+
+SAX2XMLReader * XMLReaderFactory::createXMLReader( MemoryManager* const
manager
+ , XMLGrammarPool* const
gramPool)
+{
+ SAX2XMLReaderImpl* pImpl=new (manager) SAX2XMLReaderImpl(manager,
gramPool);
+ return pImpl;
+}
const XMLCh gDTDEntityStr[] =
Modified: xerces/c/trunk/src/xercesc/sax2/XMLReaderFactory.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/sax2/XMLReaderFactory.hpp?rev=386972&r1=386971&r2=386972&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax2/XMLReaderFactory.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax2/XMLReaderFactory.hpp Sun Mar 19 06:29:49
2006
@@ -21,7 +21,7 @@
#ifndef XMLREADERFACTORY_HPP
#define XMLREADERFACTORY_HPP
-#include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
#include <xercesc/sax/SAXException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -45,10 +45,9 @@
~XMLReaderFactory() ;
public:
- static SAX2XMLReader * createXMLReader(
- MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager
- , XMLGrammarPool* const gramPool
= 0
- ) ;
+ static SAX2XMLReader * createXMLReader( MemoryManager* const manager
= XMLPlatformUtils::fgMemoryManager
+ , XMLGrammarPool* const gramPool = 0
+ ) ;
static SAX2XMLReader * createXMLReader(const XMLCh* className) ;
private:
@@ -58,13 +57,6 @@
XMLReaderFactory(const XMLReaderFactory&);
XMLReaderFactory& operator=(const XMLReaderFactory&);
};
-
-
-inline SAX2XMLReader * XMLReaderFactory::createXMLReader(MemoryManager* const
manager
- , XMLGrammarPool* const
gramPool)
-{
- return (SAX2XMLReader*)(new (manager) SAX2XMLReaderImpl(manager,
gramPool));
-}
inline SAX2XMLReader * XMLReaderFactory::createXMLReader(const XMLCh *)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
