gareth 2003/05/30 09:11:46
Modified: c/src/xercesc/dom DOMError.hpp DOMInputSource.hpp
c/src/xercesc/framework Wrapper4DOMInputSource.cpp
Wrapper4DOMInputSource.hpp Wrapper4InputSource.cpp
Wrapper4InputSource.hpp XMLFormatter.cpp
XMLFormatter.hpp
c/src/xercesc/internal IGXMLScanner2.cpp SGXMLScanner.cpp
c/src/xercesc/sax ErrorHandler.hpp HandlerBase.hpp
InputSource.hpp
c/src/xercesc/util RefArrayVectorOf.c RefVectorOf.c
c/src/xercesc/validators/common CMLeaf.hpp
c/src/xercesc/validators/schema TraverseSchema.cpp
Log:
Fixes so we compile under VC7.1. Patch by Alberto Massari.
Revision Changes Path
1.10 +4 -1 xml-xerces/c/src/xercesc/dom/DOMError.hpp
Index: DOMError.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/DOMError.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMError.hpp 14 May 2003 18:06:53 -0000 1.9
+++ DOMError.hpp 30 May 2003 16:11:43 -0000 1.10
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.10 2003/05/30 16:11:43 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.9 2003/05/14 18:06:53 gareth
* Updated DOMError to
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/core.html.
*
@@ -279,7 +282,7 @@
* @see getRelatedException
* @since DOM Level 3
*/
- virtual void setRelatedException(void* exception) const = 0;
+ virtual void setRelatedException(void* exc) const = 0;
/**
* A <code>XMLCh*</code> indicating which related data is expected in
1.10 +2 -2 xml-xerces/c/src/xercesc/dom/DOMInputSource.hpp
Index: DOMInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/DOMInputSource.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMInputSource.hpp 7 Mar 2003 19:59:05 -0000 1.9
+++ DOMInputSource.hpp 30 May 2003 16:11:43 -0000 1.10
@@ -301,7 +301,7 @@
* False if the parser issue warning message instead.
* @see #setIssueFatalErrorIfNotFound
*/
- virtual const bool getIssueFatalErrorIfNotFound() const = 0;
+ virtual bool getIssueFatalErrorIfNotFound() const = 0;
/**
* Called to indicate that this DOMInputSource is no longer in use
1.5 +4 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Wrapper4DOMInputSource.cpp 16 May 2003 21:36:55 -0000 1.4
+++ Wrapper4DOMInputSource.cpp 30 May 2003 16:11:43 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/05/30 16:11:43 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.4 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -105,7 +108,7 @@
// ---------------------------------------------------------------------------
// Wrapper4DOMInputSource: Getter methods
// ---------------------------------------------------------------------------
-const bool Wrapper4DOMInputSource::getIssueFatalErrorIfNotFound() const
+bool Wrapper4DOMInputSource::getIssueFatalErrorIfNotFound() const
{
return fInputSource->getIssueFatalErrorIfNotFound();
}
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Wrapper4DOMInputSource.hpp 16 May 2003 21:36:55 -0000 1.5
+++ Wrapper4DOMInputSource.hpp 30 May 2003 16:11:43 -0000 1.6
@@ -175,7 +175,7 @@
* False if the parser issue warning message instead.
* @see #setIssueFatalErrorIfNotFound
*/
- const bool getIssueFatalErrorIfNotFound() const;
+ bool getIssueFatalErrorIfNotFound() const;
//@}
1.5 +4 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Wrapper4InputSource.cpp 4 Nov 2002 15:00:21 -0000 1.4
+++ Wrapper4InputSource.cpp 30 May 2003 16:11:43 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/05/30 16:11:43 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.4 2002/11/04 15:00:21 tng
* C++ Namespace Support.
*
@@ -103,7 +106,7 @@
// ---------------------------------------------------------------------------
// Wrapper4InputSource: Getter methods
// ---------------------------------------------------------------------------
-const bool Wrapper4InputSource::getIssueFatalErrorIfNotFound() const
+bool Wrapper4InputSource::getIssueFatalErrorIfNotFound() const
{
return fInputSource->getIssueFatalErrorIfNotFound();
}
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Wrapper4InputSource.hpp 7 Mar 2003 18:08:10 -0000 1.6
+++ Wrapper4InputSource.hpp 30 May 2003 16:11:43 -0000 1.7
@@ -183,7 +183,7 @@
* False if the parser issue warning message instead.
* @see #setIssueFatalErrorIfNotFound
*/
- const bool getIssueFatalErrorIfNotFound() const;
+ bool getIssueFatalErrorIfNotFound() const;
//@}
1.13 +2 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLFormatter.cpp 16 May 2003 21:36:55 -0000 1.12
+++ XMLFormatter.cpp 30 May 2003 16:11:43 -0000 1.13
@@ -488,7 +488,7 @@
// ---------------------------------------------------------------------------
// XMLFormatter: Private helper methods
// ---------------------------------------------------------------------------
-const void XMLFormatter::writeCharRef(const XMLCh &toWrite)
+void XMLFormatter::writeCharRef(const XMLCh &toWrite)
{
XMLCh tmpBuf[32];
tmpBuf[0] = chAmpersand;
1.15 +4 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLFormatter.hpp 16 May 2003 21:36:55 -0000 1.14
+++ XMLFormatter.hpp 30 May 2003 16:11:43 -0000 1.15
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2003/05/30 16:11:43 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.14 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -428,7 +431,7 @@
XMLByte* &ref,
const XMLCh * stdRef);
- const void writeCharRef(const XMLCh &toWrite);
+ void writeCharRef(const XMLCh &toWrite);
bool inEscapeList(const XMLFormatter::EscapeFlags escStyle
, const XMLCh toCheck);
1.21 +3 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- IGXMLScanner2.cpp 18 May 2003 14:02:04 -0000 1.20
+++ IGXMLScanner2.cpp 30 May 2003 16:11:44 -0000 1.21
@@ -1369,7 +1369,7 @@
Janitor<InputSource> janSrc(srcToFill);
// Should just issue warning if the schema is not found
- const bool flag = srcToFill->getIssueFatalErrorIfNotFound();
+ bool flag = srcToFill->getIssueFatalErrorIfNotFound();
srcToFill->setIssueFatalErrorIfNotFound(false);
parser.parse(*srcToFill);
@@ -1570,7 +1570,7 @@
parser.setUserErrorReporter(fErrorReporter);
// Should just issue warning if the schema is not found
- const bool flag = src.getIssueFatalErrorIfNotFound();
+ bool flag = src.getIssueFatalErrorIfNotFound();
((InputSource&) src).setIssueFatalErrorIfNotFound(false);
parser.parse(src);
1.27 +3 -3 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SGXMLScanner.cpp 18 May 2003 14:02:04 -0000 1.26
+++ SGXMLScanner.cpp 30 May 2003 16:11:44 -0000 1.27
@@ -3136,7 +3136,7 @@
Janitor<InputSource> janSrc(srcToFill);
// Should just issue warning if the schema is not found
- const bool flag = srcToFill->getIssueFatalErrorIfNotFound();
+ bool flag = srcToFill->getIssueFatalErrorIfNotFound();
srcToFill->setIssueFatalErrorIfNotFound(false);
parser.parse(*srcToFill);
@@ -3306,7 +3306,7 @@
parser.setUserErrorReporter(fErrorReporter);
// Should just issue warning if the schema is not found
- const bool flag = src.getIssueFatalErrorIfNotFound();
+ bool flag = src.getIssueFatalErrorIfNotFound();
((InputSource&) src).setIssueFatalErrorIfNotFound(false);
parser.parse(src);
1.4 +6 -3 xml-xerces/c/src/xercesc/sax/ErrorHandler.hpp
Index: ErrorHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/ErrorHandler.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorHandler.hpp 7 Mar 2003 18:10:06 -0000 1.3
+++ ErrorHandler.hpp 30 May 2003 16:11:44 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2003/05/30 16:11:44 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.3 2003/03/07 18:10:06 tng
* Return a reference instead of void for operator=
*
@@ -162,7 +165,7 @@
* wrapping another exception.
* @see SAXParseException#SAXParseException
*/
- virtual void warning(const SAXParseException& exception) = 0;
+ virtual void warning(const SAXParseException& exc) = 0;
/**
* Receive notification of a recoverable error.
@@ -186,7 +189,7 @@
* wrapping another exception.
* @see SAXParseException#SAXParseException
*/
- virtual void error(const SAXParseException& exception) = 0;
+ virtual void error(const SAXParseException& exc) = 0;
/**
* Receive notification of a non-recoverable error.
@@ -208,7 +211,7 @@
* wrapping another exception.
* @see SAXParseException#SAXParseException
*/
- virtual void fatalError(const SAXParseException& exception) = 0;
+ virtual void fatalError(const SAXParseException& exc) = 0;
/**
* Reset the Error handler object on its reuse
1.6 +8 -5 xml-xerces/c/src/xercesc/sax/HandlerBase.hpp
Index: HandlerBase.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/HandlerBase.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HandlerBase.hpp 4 Nov 2002 14:56:25 -0000 1.5
+++ HandlerBase.hpp 30 May 2003 16:11:44 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 16:11:44 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.5 2002/11/04 14:56:25 tng
* C++ Namespace Support.
*
@@ -339,7 +342,7 @@
* @see ErrorHandler#warning
* @see SAXParseException#SAXParseException
*/
- virtual void error(const SAXParseException& exception);
+ virtual void error(const SAXParseException& exc);
/**
* Report a fatal XML parsing error.
@@ -358,7 +361,7 @@
* @see ErrorHandler#fatalError
* @see SAXParseException#SAXParseException
*/
- virtual void fatalError(const SAXParseException& exception);
+ virtual void fatalError(const SAXParseException& exc);
/**
* Receive notification of a parser warning.
@@ -374,7 +377,7 @@
* @see ErrorHandler#warning
* @see SAXParseException#SAXParseException
*/
- virtual void warning(const SAXParseException& exception);
+ virtual void warning(const SAXParseException& exc);
/**
* Reset the Error handler object on its reuse
@@ -461,9 +464,9 @@
{
}
-inline void HandlerBase::fatalError(const SAXParseException& exception)
+inline void HandlerBase::fatalError(const SAXParseException& exc)
{
- throw exception;
+ throw exc;
}
inline void
1.8 +5 -2 xml-xerces/c/src/xercesc/sax/InputSource.hpp
Index: InputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/InputSource.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InputSource.hpp 16 May 2003 21:36:59 -0000 1.7
+++ InputSource.hpp 30 May 2003 16:11:45 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/05/30 16:11:45 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.7 2003/05/16 21:36:59 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -232,7 +235,7 @@
* False if the parser issue warning message instead.
* @see #setIssueFatalErrorIfNotFound
*/
- virtual const bool getIssueFatalErrorIfNotFound() const;
+ virtual bool getIssueFatalErrorIfNotFound() const;
MemoryManager* getMemoryManager() const;
@@ -403,7 +406,7 @@
return fSystemId;
}
-inline const bool InputSource::getIssueFatalErrorIfNotFound() const
+inline bool InputSource::getIssueFatalErrorIfNotFound() const
{
return fFatalErrorIfNotFound;
}
1.7 +31 -31 xml-xerces/c/src/xercesc/util/RefArrayVectorOf.c
Index: RefArrayVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefArrayVectorOf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RefArrayVectorOf.c 27 May 2003 16:52:16 -0000 1.6
+++ RefArrayVectorOf.c 30 May 2003 16:11:45 -0000 1.7
@@ -22,85 +22,85 @@
template <class TElem> RefArrayVectorOf<TElem>::~RefArrayVectorOf()
{
- if (fAdoptedElems)
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
{
- for (unsigned int index = 0; index < fCurCount; index++)
- fMemoryManager->deallocate(fElemList[index]);//delete[]
fElemList[index];
+ for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount;
index++)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);//delete[]
fElemList[index];
}
- fMemoryManager->deallocate(fElemList);//delete [] fElemList;
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList);//delete
[] fElemList;
}
template <class TElem> void
RefArrayVectorOf<TElem>::setElementAt(TElem* const toSet, const unsigned int setAt)
{
- if (setAt >= fCurCount)
+ if (setAt >= BaseRefVectorOf<TElem>::fCurCount)
ThrowXML(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex);
- if (fAdoptedElems)
- fMemoryManager->deallocate(fElemList[setAt]);
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[setAt]);
- fElemList[setAt] = toSet;
+ BaseRefVectorOf<TElem>::fElemList[setAt] = toSet;
}
template <class TElem> void RefArrayVectorOf<TElem>::removeAllElements()
{
- for (unsigned int index = 0; index < fCurCount; index++)
+ for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount; index++)
{
- if (fAdoptedElems)
- fMemoryManager->deallocate(fElemList[index]);
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);
// Keep unused elements zero for sanity's sake
- fElemList[index] = 0;
+ BaseRefVectorOf<TElem>::fElemList[index] = 0;
}
- fCurCount = 0;
+ BaseRefVectorOf<TElem>::fCurCount = 0;
}
template <class TElem> void RefArrayVectorOf<TElem>::
removeElementAt(const unsigned int removeAt)
{
- if (removeAt >= fCurCount)
+ if (removeAt >= BaseRefVectorOf<TElem>::fCurCount)
ThrowXML(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex);
- if (fAdoptedElems)
- fMemoryManager->deallocate(fElemList[removeAt]);
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[removeAt]);
// Optimize if its the last element
- if (removeAt == fCurCount-1)
+ if (removeAt == BaseRefVectorOf<TElem>::fCurCount-1)
{
- fElemList[removeAt] = 0;
- fCurCount--;
+ BaseRefVectorOf<TElem>::fElemList[removeAt] = 0;
+ BaseRefVectorOf<TElem>::fCurCount--;
return;
}
// Copy down every element above remove point
- for (unsigned int index = removeAt; index < fCurCount-1; index++)
- fElemList[index] = fElemList[index+1];
+ for (unsigned int index = removeAt; index <
BaseRefVectorOf<TElem>::fCurCount-1; index++)
+ BaseRefVectorOf<TElem>::fElemList[index] =
BaseRefVectorOf<TElem>::fElemList[index+1];
// Keep unused elements zero for sanity's sake
- fElemList[fCurCount-1] = 0;
+ BaseRefVectorOf<TElem>::fElemList[BaseRefVectorOf<TElem>::fCurCount-1] = 0;
// And bump down count
- fCurCount--;
+ BaseRefVectorOf<TElem>::fCurCount--;
}
template <class TElem> void RefArrayVectorOf<TElem>::removeLastElement()
{
- if (!fCurCount)
+ if (!BaseRefVectorOf<TElem>::fCurCount)
return;
- fCurCount--;
+ BaseRefVectorOf<TElem>::fCurCount--;
- if (fAdoptedElems)
- fMemoryManager->deallocate(fElemList[fCurCount]);
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[BaseRefVectorOf<TElem>::fCurCount]);
}
template <class TElem> void RefArrayVectorOf<TElem>::cleanup()
{
- if (fAdoptedElems)
+ if (BaseRefVectorOf<TElem>::fAdoptedElems)
{
- for (unsigned int index = 0; index < fCurCount; index++)
- fMemoryManager->deallocate(fElemList[index]);
+ for (unsigned int index = 0; index < BaseRefVectorOf<TElem>::fCurCount;
index++)
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList[index]);
}
- fMemoryManager->deallocate(fElemList);//delete [] fElemList;
+
BaseRefVectorOf<TElem>::fMemoryManager->deallocate(BaseRefVectorOf<TElem>::fElemList);//delete
[] fElemList;
}
XERCES_CPP_NAMESPACE_END
1.10 +4 -1 xml-xerces/c/src/xercesc/util/RefVectorOf.c
Index: RefVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefVectorOf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RefVectorOf.c 16 May 2003 06:01:52 -0000 1.9
+++ RefVectorOf.c 30 May 2003 16:11:45 -0000 1.10
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.10 2003/05/30 16:11:45 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.9 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -136,7 +139,7 @@
for (unsigned int index = 0; index < this->fCurCount; index++)
delete this->fElemList[index];
}
- fMemoryManager->deallocate(this->fElemList);//delete [] this->fElemList;
+ BaseRefVectorOf<TElem>::fMemoryManager->deallocate(this->fElemList);//delete
[] this->fElemList;
}
1.6 +4 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CMLeaf.hpp 18 May 2003 14:02:06 -0000 1.5
+++ CMLeaf.hpp 30 May 2003 16:11:45 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 16:11:45 gareth
+ * Fixes so we compile under VC7.1. Patch by Alberto Massari.
+ *
* Revision 1.5 2003/05/18 14:02:06 knoaman
* Memory manager implementation: pass per instance manager.
*
@@ -142,7 +145,7 @@
CMLeaf
(
QName* const element
- , const unsigned int position = ~0
+ , const unsigned int position = (~0)
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
CMLeaf
1.76 +4 -4 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- TraverseSchema.cpp 26 May 2003 22:05:01 -0000 1.75
+++ TraverseSchema.cpp 30 May 2003 16:11:45 -0000 1.76
@@ -526,7 +526,7 @@
fParser->setUserErrorReporter(fErrorReporter);
// Should just issue warning if the schema is not found
- const bool flag = srcToFill->getIssueFatalErrorIfNotFound();
+ bool flag = srcToFill->getIssueFatalErrorIfNotFound();
srcToFill->setIssueFatalErrorIfNotFound(false);
fParser->parse(*srcToFill);
@@ -705,7 +705,7 @@
fParser->setUserErrorReporter(fErrorReporter);
// Should just issue warning if the schema is not found
- const bool flag = srcToFill->getIssueFatalErrorIfNotFound();
+ bool flag = srcToFill->getIssueFatalErrorIfNotFound();
srcToFill->setIssueFatalErrorIfNotFound(false);
fParser->parse(*srcToFill) ;
@@ -7535,7 +7535,7 @@
fParser->setUserErrorReporter(fErrorReporter);
// Should just issue warning if the schema is not found
- const bool flag = srcToFill->getIssueFatalErrorIfNotFound();
+ bool flag = srcToFill->getIssueFatalErrorIfNotFound();
srcToFill->setIssueFatalErrorIfNotFound(false);
fParser->parse(*srcToFill) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
