You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2004/06/17 12:55:41 UTC
cvs commit: ws-axis/c/vc/xml/xerces AxisXMLParserXerces.dsp
susantha 2004/06/17 03:55:41
Modified: c/src/xml/xerces XMLParserXerces.cpp
c/vc AxisClientDLL.dsp
c/vc/xml/xerces AxisXMLParserXerces.dsp
Log:
Updated VC project files to eleminate compilation errors due to addition of Exceptions
Revision Changes Path
1.5 +23 -23 ws-axis/c/src/xml/xerces/XMLParserXerces.cpp
Index: XMLParserXerces.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLParserXerces.cpp 14 Jun 2004 08:00:47 -0000 1.4
+++ XMLParserXerces.cpp 17 Jun 2004 10:55:41 -0000 1.5
@@ -79,33 +79,33 @@
bool bCanParseMore = false;
try
{
- if(!m_bFirstParsed)
- {
- m_pParser->parseFirst(*m_pInputSource, m_ScanToken);
- m_bFirstParsed = true;
- }
-
- m_Xhandler.freeElement();
- while (true)
- {
- AnyElement* elem = m_Xhandler.getAnyElement();
- if (!elem)
+ if(!m_bFirstParsed)
{
- bCanParseMore = m_pParser->parseNext(m_ScanToken);
- elem = m_Xhandler.getAnyElement();
+ m_pParser->parseFirst(*m_pInputSource, m_ScanToken);
+ m_bFirstParsed = true;
}
- if (elem)
+
+ m_Xhandler.freeElement();
+ while (true)
{
- if (!isCharData && (CHARACTER_ELEMENT == elem->m_type))
- { /* ignorable white space */
- m_Xhandler.freeElement();
- continue;
- }
- return elem;
+ AnyElement* elem = m_Xhandler.getAnyElement();
+ if (!elem)
+ {
+ bCanParseMore = m_pParser->parseNext(m_ScanToken);
+ elem = m_Xhandler.getAnyElement();
+ }
+ if (elem)
+ {
+ if (!isCharData && (CHARACTER_ELEMENT == elem->m_type))
+ { /* ignorable white space */
+ m_Xhandler.freeElement();
+ continue;
+ }
+ return elem;
+ }
+ else if (AXIS_FAIL == m_Xhandler.getStatus()) return NULL;
+ else if (!bCanParseMore) return NULL;
}
- else if (AXIS_FAIL == m_Xhandler.getStatus()) return NULL;
- else if (!bCanParseMore) return NULL;
- }
}
catch(AxisParseException& e)
{
1.16 +8 -0 ws-axis/c/vc/AxisClientDLL.dsp
Index: AxisClientDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisClientDLL.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AxisClientDLL.dsp 15 Jun 2004 16:19:54 -0000 1.15
+++ AxisClientDLL.dsp 17 Jun 2004 10:55:41 -0000 1.16
@@ -138,6 +138,10 @@
# End Source File
# Begin Source File
+SOURCE=..\src\xml\AxisParseException.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\src\soap\AxisSoapException.cpp
# End Source File
# Begin Source File
@@ -147,6 +151,10 @@
# Begin Source File
SOURCE=..\src\common\AxisTrace.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\transport\axis\AxisTransportException.cpp
# End Source File
# Begin Source File
1.3 +8 -0 ws-axis/c/vc/xml/xerces/AxisXMLParserXerces.dsp
Index: AxisXMLParserXerces.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/xml/xerces/AxisXMLParserXerces.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisXMLParserXerces.dsp 27 May 2004 05:07:45 -0000 1.2
+++ AxisXMLParserXerces.dsp 17 Jun 2004 10:55:41 -0000 1.3
@@ -92,6 +92,14 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\..\..\src\common\AxisException.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\xml\AxisParseException.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\xml\xerces\ParserLoader.cpp
# End Source File
# Begin Source File