Simplify code using xerces namespace
This commit is contained in:
@@ -36,13 +36,6 @@
|
||||
#include "InputSource.h"
|
||||
#include "XMLTools.h"
|
||||
|
||||
#ifndef XERCES_CPP_NAMESPACE_BEGIN
|
||||
# define XERCES_CPP_NAMESPACE_QUALIFIER
|
||||
using namespace XERCES_CPP_NAMESPACE;
|
||||
#else
|
||||
XERCES_CPP_NAMESPACE_USE
|
||||
#endif
|
||||
|
||||
using namespace Base;
|
||||
using namespace std;
|
||||
|
||||
@@ -113,10 +106,7 @@ struct StdInputStream::TextCodec
|
||||
};
|
||||
#endif
|
||||
|
||||
StdInputStream::StdInputStream(
|
||||
std::istream& Stream,
|
||||
XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager* const manager
|
||||
)
|
||||
StdInputStream::StdInputStream(std::istream& Stream, XERCES_CPP_NAMESPACE::MemoryManager* const manager)
|
||||
: stream(Stream)
|
||||
, codec(new TextCodec)
|
||||
{
|
||||
@@ -157,7 +147,7 @@ XMLSize_t StdInputStream::readBytes(XMLByte* const toFill, const XMLSize_t maxTo
|
||||
StdInputSource::StdInputSource(
|
||||
std::istream& Stream,
|
||||
const char* filePath,
|
||||
XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager* const manager
|
||||
XERCES_CPP_NAMESPACE::MemoryManager* const manager
|
||||
)
|
||||
: InputSource(manager)
|
||||
, stream(Stream)
|
||||
@@ -174,7 +164,7 @@ StdInputSource::~StdInputSource() = default;
|
||||
// ---------------------------------------------------------------------------
|
||||
// StdInputSource: InputSource interface implementation
|
||||
// ---------------------------------------------------------------------------
|
||||
BinInputStream* StdInputSource::makeStream() const
|
||||
XERCES_CPP_NAMESPACE::BinInputStream* StdInputSource::makeStream() const
|
||||
{
|
||||
StdInputStream* retStrm = new StdInputStream(stream /*, getMemoryManager()*/);
|
||||
return retStrm;
|
||||
|
||||
Reference in New Issue
Block a user