svn commit: r920376 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf: io/BufferedInputStream.cpp util/zip/InflaterInputStream.cpp

[tabish]

Author: tabish
Date: Mon Mar  8 16:08:42 2010
New Revision: 920376

URL: http://svn.apache.org/viewvc?rev=920376&view=rev
Log:
Fix two type conversion warnings that only show up on Windows

Modified:
    
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
    
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp

Modified: 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp?rev=920376&r1=920375&r2=920376&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
 Mon Mar  8 16:08:42 2010
@@ -126,7 +126,7 @@
         }
 
         void reset() {
-            this->pos = this->markPos;
+            this->pos = (std::size_t)this->markPos;
         }
 
         void normalizeBuffer() {

Modified: 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp?rev=920376&r1=920375&r2=920376&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
 Mon Mar  8 16:08:42 2010
@@ -113,7 +113,7 @@
     try{
 
         std::size_t count = 0;
-        std::size_t remaining = Math::min( (long long)num, (long 
long)buff.size() );
+        std::size_t remaining = (std::size_t)Math::min( (long long)num, (long 
long)buff.size() );
 
         std::vector<unsigned char> buffer( remaining );