svn commit: r670652 - in /xerces/c/trunk/src/xercesc/util/NetAccessors: BinHTTPInputStreamCommon.cpp BinHTTPInputStreamCommon.hpp WinSock/BinHTTPURLInputStream.cpp

[amassari]

Author: amassari
Date: Mon Jun 23 08:22:44 2008
New Revision: 670652

URL: http://svn.apache.org/viewvc?rev=670652&view=rev
Log:
Fixed compilation on Visual C++

Modified:
    xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp
    xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp
    
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp

Modified: 
xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp?rev=670652&r1=670651&r2=670652&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp 
(original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp 
Mon Jun 23 08:22:44 2008
@@ -212,9 +212,9 @@
     buffer.append(CRLF);
 }
 
-XMLCh *BinHTTPInputStreamCommon::findHeader(const char *name) const
+XMLCh *BinHTTPInputStreamCommon::findHeader(const char *name)
 {
-    int len = strlen(name);
+    XMLSize_t len = strlen(name);
 
     char *p = strstr(fBuffer.getRawBuffer(), name);
     while(p != 0) {
@@ -318,7 +318,7 @@
 {
     if(fContentType == 0) {
         // mutable
-        const_cast<XMLCh*&>(fContentType) = findHeader("Content-Type");
+        const_cast<XMLCh*&>(fContentType) = 
const_cast<BinHTTPInputStreamCommon*>(this)->findHeader("Content-Type");
     }
     return fContentType;
 }

Modified: 
xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp?rev=670652&r1=670651&r2=670652&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp 
(original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp 
Mon Jun 23 08:22:44 2008
@@ -26,6 +26,7 @@
 #include <xercesc/util/BinInputStream.hpp>
 #include <xercesc/util/XMLNetAccessor.hpp>
 #include <xercesc/framework/MemoryManager.hpp>
+#include <string.h>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -177,7 +178,7 @@
      * \return The HTTP status code
      */
     int sendRequest(const XMLURL &url, const XMLNetHTTPInfo *httpInfo);
-    XMLCh *findHeader(const char *name) const;
+    XMLCh *findHeader(const char *name);
 
     virtual bool send(const char *buf, XMLSize_t len) = 0;
     /**

Modified: 
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp?rev=670652&r1=670651&r2=670652&view=diff
==============================================================================
--- 
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp 
(original)
+++ 
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp 
Mon Jun 23 08:22:44 2008
@@ -20,6 +20,7 @@
  */
 
 
+#include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
 #include <windows.h>
 
 #ifdef WITH_IPV6
@@ -31,7 +32,6 @@
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XMLNetAccessor.hpp>
-#include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/util/XMLExceptMsgs.hpp>
 #include <xercesc/util/Janitor.hpp>
@@ -466,7 +466,7 @@
     int ret;
 
     while(done < len) {
-        ret = wrap_send(fSocketHandle, buf + done, len - done, 0);
+        ret = wrap_send(fSocketHandle, buf + done, (int)(len - done), 0);
         if(ret == SOCKET_ERROR) return false;
         done += ret;
     }
@@ -476,7 +476,7 @@
 
 int BinHTTPURLInputStream::receive(char *buf, XMLSize_t len)
 {
-    int iLen = wrap_recv(fSocketHandle, buf, len, 0);
+    int iLen = wrap_recv(fSocketHandle, buf, (int)len, 0);
     if (iLen == SOCKET_ERROR) return -1;
     return iLen;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]