svn commit: r689070 - /activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp

[tabish]

Author: tabish
Date: Tue Aug 26 06:35:56 2008
New Revision: 689070

URL: http://svn.apache.org/viewvc?rev=689070&view=rev
Log:
Fix warnings on windows

Modified:
    
activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp

Modified: 
activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp?rev=689070&r1=689069&r2=689070&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp 
(original)
+++ 
activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIEncoderDecoder.cpp 
Tue Aug 26 06:35:56 2008
@@ -48,7 +48,7 @@
             if( i + 2 >= s.length() ) {
                 throw URISyntaxException(
                     __FILE__, __LINE__, s,
-                    "invalid Encoded data", i );
+                    "invalid Encoded data", (int)i );
             }
 
             int d1 = Character::digit( *(++itr), 16 );
@@ -57,7 +57,7 @@
             if( d1 == -1 || d2 == -1 ) {
                 throw URISyntaxException(
                     __FILE__, __LINE__, s,
-                    "Invalid Hex Digit in char", i );
+                    "Invalid Hex Digit in char", (int)i );
             }
 
             i += 2;
@@ -73,7 +73,7 @@
 
             throw URISyntaxException(
                 __FILE__, __LINE__, s,
-                "string contains Invalid Character", i );
+                "string contains Invalid Character", (int)i );
         }
     }
 }
@@ -87,11 +87,11 @@
 
     for( int i = 0; itr != s.end(); ++i, ++itr ) {
         if( !Character::isLetterOrDigit( *itr ) ||
-            !legal.find( *itr ) > std::string::npos ) {
+            !( legal.find( *itr ) > std::string::npos ) ) {
 
             throw URISyntaxException(
                 __FILE__, __LINE__, s,
-                "string contains invalid ASCII chars", i );
+                "string contains invalid ASCII chars", (int)i );
         }
     }
 }