You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/03/23 21:54:01 UTC
svn commit: r926773 -
/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp
Author: tabish
Date: Tue Mar 23 20:54:00 2010
New Revision: 926773
URL: http://svn.apache.org/viewvc?rev=926773&view=rev
Log:
Fix some type conversion warnings.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp?rev=926773&r1=926772&r2=926773&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIHelper.cpp Tue Mar 23 20:54:00 2010
@@ -93,7 +93,7 @@ URIType URIHelper::parseURI( const std::
if( result.getScheme() == "" ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Scheme not specified.", index );
+ uri, "Scheme not specified.", (int)index );
}
validateScheme( uri, result.getScheme(), 0 );
@@ -102,7 +102,7 @@ URIType URIHelper::parseURI( const std::
if( result.getSchemeSpecificPart() == "" ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Scheme specific part is invalid..", index + 1 );
+ uri, "Scheme specific part is invalid..", (int)index + 1 );
}
} else {
@@ -141,7 +141,7 @@ URIType URIHelper::parseURI( const std::
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Scheme specific part is invalid..", uri.length() );
+ uri, "Scheme specific part is invalid..", (int)uri.length() );
}
}
@@ -190,7 +190,7 @@ void URIHelper::validateScheme( const st
if( !Character::isLetter( scheme.at(0) ) ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Schema must start with a Letter.", index );
+ uri, "Schema must start with a Letter.", (int)index );
}
try {
@@ -198,7 +198,7 @@ void URIHelper::validateScheme( const st
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid Schema", index + e.getIndex() );
+ uri, "Invalid Schema", (int)index + e.getIndex() );
}
}
@@ -212,7 +212,7 @@ void URIHelper::validateSsp( const std::
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid URI Ssp", index + e.getIndex() );
+ uri, "Invalid URI Ssp", (int)index + e.getIndex() );
}
}
@@ -227,7 +227,7 @@ void URIHelper::validateAuthority( const
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid URI Authority", index + e.getIndex() );
+ uri, "Invalid URI Authority", (int)index + e.getIndex() );
}
}
@@ -242,7 +242,7 @@ void URIHelper::validatePath( const std:
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid URI Path", index + e.getIndex() );
+ uri, "Invalid URI Path", (int)index + e.getIndex() );
}
}
@@ -256,7 +256,7 @@ void URIHelper::validateQuery( const std
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid URI Query", index + e.getIndex() );
+ uri, "Invalid URI Query", (int)index + e.getIndex() );
}
}
@@ -270,7 +270,7 @@ void URIHelper::validateFragment( const
} catch( URISyntaxException& e ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "Invalid URI Fragment", index + e.getIndex() );
+ uri, "Invalid URI Fragment", (int)index + e.getIndex() );
}
}
@@ -317,7 +317,7 @@ URIType URIHelper::parseAuthority( bool
throw URISyntaxException(
__FILE__, __LINE__,
authority, "Port number is missing",
- hostindex + index + 1 );
+ (int)hostindex + (int)index + 1 );
}
return result;
@@ -329,7 +329,7 @@ URIType URIHelper::parseAuthority( bool
throw URISyntaxException(
__FILE__, __LINE__,
authority, "Port number is malformed.",
- hostindex + index + 1 );
+ (int)hostindex + (int)index + 1 );
}
return result;
@@ -344,7 +344,7 @@ URIType URIHelper::parseAuthority( bool
if( forceServer ) {
throw URISyntaxException(
__FILE__, __LINE__,
- authority, "Host name is empty", hostindex );
+ authority, "Host name is empty", (int)hostindex );
}
return result;
}
@@ -381,7 +381,7 @@ void URIHelper::validateUserinfo( const
if( ch == ']' || ch == '[' ) {
throw URISyntaxException(
__FILE__, __LINE__,
- uri, "User Info cannot contain '[' or ']'", index + i );
+ uri, "User Info cannot contain '[' or ']'", (int)( index + i ) );
}
}
}