You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/07/13 08:49:44 UTC
svn commit: r676267 - in /xalan/c/trunk/src/xalanc:
Include/VCPPDefinitions.hpp PlatformSupport/XalanStdOutputStream.cpp
XPath/XPathEnvSupportDefault.cpp
XercesParserLiaison/XercesDocumentWrapper.cpp
XercesParserLiaison/XercesDocumentWrapper.hpp
Author: dbertoni
Date: Sat Jul 12 23:49:43 2008
New Revision: 676267
URL: http://svn.apache.org/viewvc?rev=676267&view=rev
Log:
Visual C++ 6.0 fixes.
Modified:
xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
Modified: xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp?rev=676267&r1=676266&r2=676267&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp Sat Jul 12 23:49:43 2008
@@ -19,7 +19,7 @@
#define VCPPDEFINITIONS_HEADER_GUARD_1357924680
-#pragma warning(disable: 4127 4146 4251 4345 4351 4355 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)
+#pragma warning(disable: 4127 4146 4251 4284 4345 4351 4355 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)
#include <basetsd.h>
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp?rev=676267&r1=676266&r2=676267&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp Sat Jul 12 23:49:43 2008
@@ -74,9 +74,12 @@
#endif
}
+
+
XalanStdOutputStream*
-XalanStdOutputStream::create( StreamType& theOutputStream,
- MemoryManagerType& theManager)
+XalanStdOutputStream::create(
+ StreamType& theOutputStream,
+ MemoryManager& theManager)
{
typedef XalanStdOutputStream ThisType;
@@ -91,6 +94,8 @@
return theResult;
}
+
+
XalanStdOutputStream::~XalanStdOutputStream()
{
}
@@ -123,16 +128,16 @@
XalanStdOutputStream::doFlush()
{
// Don't try to flush if the stream is in a bad state...
- if(m_outputStream)
+ if (m_outputStream)
{
m_outputStream.flush();
- if(!m_outputStream)
+ if (!m_outputStream)
{
#if defined(XALAN_STRICT_ANSI_HEADERS)
using namespace std;
#endif
- XalanDOMString thebuffer(getMemoryManager());
+ XalanDOMString thebuffer(getMemoryManager());
throw XalanStdOutputStreamWriteException(errno, thebuffer);
}
@@ -146,16 +151,16 @@
const char* theBuffer,
size_type theBufferLength)
{
- assert(static_cast<XALAN_UINT64>(StreamSizeType(theBufferLength)) == theBufferLength);
+ assert(static_cast<XALAN_UINT64>(static_cast<StreamSizeType>(theBufferLength)) == theBufferLength);
m_outputStream.write(theBuffer, StreamSizeType(theBufferLength));
- if(!m_outputStream)
+ if (!m_outputStream)
{
#if defined(XALAN_STRICT_ANSI_HEADERS)
using namespace std;
#endif
- XalanDOMString thebuffer(getMemoryManager());
+ XalanDOMString thebuffer(getMemoryManager());
throw XalanStdOutputStreamWriteException(errno, thebuffer);
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp?rev=676267&r1=676266&r2=676267&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp Sat Jul 12 23:49:43 2008
@@ -460,18 +460,18 @@
}
cerr << ", at line number "
- << lineNo
+ << static_cast<long>(lineNo)
<< " at offset "
- << charOffset
+ << static_cast<long>(charOffset)
<< endl;
- return classification == XPathEnvSupport::eError ? true : false;
+ return classification == eError ? true : false;
}
XPathEnvSupportDefault::NamespaceFunctionTableDeleteFunctor::NamespaceFunctionTableDeleteFunctor(MemoryManagerType& theManager) :
-m_memMgr(theManager)
+ m_memMgr(theManager)
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp?rev=676267&r1=676266&r2=676267&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp Sat Jul 12 23:49:43 2008
@@ -84,7 +84,6 @@
m_xercesDocument(theXercesDocument),
m_documentElement(0),
m_nodeMap(theManager),
- m_domImplementation(theManager, XercesDOMImplementationWrapper::create(theManager, theXercesDocument->getImplementation())),
m_navigatorAllocator(theManager, 25),
m_navigator(0),
m_children(theXercesDocument->getChildNodes(),
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp?rev=676267&r1=676266&r2=676267&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp Sat Jul 12 23:49:43 2008
@@ -33,7 +33,6 @@
#if defined(XALAN_AUTO_PTR_REQUIRES_DEFINITION)
-#include <xalanc/XalanDOM/XalanDOMImplementation.hpp>
#include <xalanc/PlatformSupport/XalanDOMStringPool.hpp>
#endif
@@ -474,8 +473,6 @@
mutable XercesWrapperToXalanNodeMap m_nodeMap;
- XalanMemMgrAutoPtr<XalanDOMImplementation, true> m_domImplementation;
-
mutable XercesWrapperNavigatorAllocator m_navigatorAllocator;
// Our navigator will be the first entry in m_navigators,
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org