[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[197] trunk/wsdlpull/src

[<den...@us...>]

Revision: 197
          http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=197&view=rev
Author:   denis_arnaud
Date:     2010-07-18 15:51:14 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
[Dev] Fixed a compilation error (PATH_MAX) and a compilation warning (&& || in a if clause).

Modified Paths:
--------------
    trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
    trunk/wsdlpull/src/xmlpull/XmlUtils.cpp

Modified: trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
===================================================================
--- trunk/wsdlpull/src/schemaparser/SchemaParser.cpp	2010-07-13 22:51:54 UTC (rev 196)
+++ trunk/wsdlpull/src/schemaparser/SchemaParser.cpp	2010-07-18 15:51:14 UTC (rev 197)
@@ -834,10 +834,11 @@
       xParser_->nextTag();
       std::string elemName=xParser_->getName();
       if (xParser_->getEventType() == xParser_->END_TAG) {
-	if (cstr==Schema::Key && elemName == "key" ||
-	    cstr==Schema::Keyref && elemName == "keyref" ||
-	    cstr==Schema::Unique && elemName == "unique" )
+	if ((cstr==Schema::Key && elemName == "key")
+		 || (cstr==Schema::Keyref && elemName == "keyref")
+		 || (cstr==Schema::Unique && elemName == "unique")) {
 	  break;
+	}
 
 	//if an end tag is seen proceed till next start tag
 	while (xParser_->getEventType() != xParser_->START_TAG)

Modified: trunk/wsdlpull/src/xmlpull/XmlUtils.cpp
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlUtils.cpp	2010-07-13 22:51:54 UTC (rev 196)
+++ trunk/wsdlpull/src/xmlpull/XmlUtils.cpp	2010-07-18 15:51:14 UTC (rev 197)
@@ -36,15 +36,15 @@
 #include <unistd.h>
 #include <errno.h>
 #include <pthread.h>
-#include <stdlib.h>
+#include <cstdlib>
 #endif
 
 #ifdef WITH_CURL
 #include <curl/curl.h>
 #endif
 
-#include <time.h>
-#include <cstdlib>
+#include <ctime>
+#include <climits>
 #include <cstring>
 #include <fstream>
 #include <sstream>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.