activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r730407 - in /activemq/activemq-cpp/trunk: src/main/decaf/internal/net/URIHelper.cpp src/main/decaf/net/URI.cpp src/main/decaf/net/URISyntaxException.h vs2005-build/vs2005-activemq-unittests.vcproj vs2005-build/vs2005-activemq.vcproj
Date Wed, 31 Dec 2008 15:14:15 GMT
Author: tabish
Date: Wed Dec 31 07:14:14 2008
New Revision: 730407

URL: http://svn.apache.org/viewvc?rev=730407&view=rev
Log:
Updates windows build for all the latest changes to the project also make some more 64bit
corrections.

Modified:
    activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIHelper.cpp
    activemq/activemq-cpp/trunk/src/main/decaf/net/URI.cpp
    activemq/activemq-cpp/trunk/src/main/decaf/net/URISyntaxException.h
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIHelper.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIHelper.cpp?rev=730407&r1=730406&r2=730407&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIHelper.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/internal/net/URIHelper.cpp Wed Dec 31 07:14:14
2008
@@ -153,7 +153,7 @@
             result.setPath( temp );
         }
 
-        int pathIndex = 0;
+		std::size_t pathIndex = 0;
         if( index2 != std::string::npos ) {
             pathIndex += index2;
         }
@@ -487,8 +487,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 bool URIHelper::isValidIPv4Address( const std::string& host ) {
 
-    int index;
-    int index2;
+	std::size_t index;
+    std::size_t index2;
 
     try {
 
@@ -526,7 +526,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 bool URIHelper::isValidIP6Address( const std::string& ipAddress ) {
 
-    int length = ipAddress.length();
+    std::size_t length = ipAddress.length();
     bool doubleColon = false;
     int numberOfColons = 0;
     int numberOfPeriods = 0;
@@ -539,7 +539,7 @@
         return false;
     }
 
-    for( int i = 0; i < length; i++ ) {
+    for( std::size_t i = 0; i < length; i++ ) {
 
         prevChar = c;
         c = ipAddress.at( i );

Modified: activemq/activemq-cpp/trunk/src/main/decaf/net/URI.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/net/URI.cpp?rev=730407&r1=730406&r2=730407&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/net/URI.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/net/URI.cpp Wed Dec 31 07:14:14 2008
@@ -869,7 +869,7 @@
             result.uri.setPath( relative.uri.getPath() );
         } else {
             // resolve a relative reference
-            int endindex = this->uri.getPath().find_last_of('/') + 1;
+			std::size_t endindex = this->uri.getPath().find_last_of('/') + 1;
             result.uri.setPath( normalize(
                 this->uri.getPath().substr( 0, endindex ) + relative.uri.getPath() ) );
         }

Modified: activemq/activemq-cpp/trunk/src/main/decaf/net/URISyntaxException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/net/URISyntaxException.h?rev=730407&r1=730406&r2=730407&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/net/URISyntaxException.h (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/net/URISyntaxException.h Wed Dec 31 07:14:14
2008
@@ -29,7 +29,7 @@
 
         std::string reason;
         std::string input;
-        int index;
+		std::size_t index;
 
     public:
 
@@ -159,7 +159,7 @@
         URISyntaxException( const char* file, const int lineNumber,
                             const std::string& input,
                             const std::string& reason,
-                            int index ) throw () : Exception() {
+							std::size_t index ) throw () : Exception() {
 
             this->reason = reason;
             this->input = input;
@@ -203,7 +203,7 @@
         /**
          * @returns the index in the input string where the error occured or -1
          */
-        int getIndex() const {
+		std::size_t getIndex() const {
             return index;
         }
 

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?rev=730407&r1=730406&r2=730407&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Wed Dec 31 07:14:14
2008
@@ -3342,14 +3342,6 @@
 							Name="v3"
 							>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v3\ActiveMQBlobMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v3\ActiveMQBlobMessageMarshallerTest.h"
-								>
-							</File>
-							<File
 								RelativePath="..\src\test\activemq\connector\openwire\marshal\v3\ActiveMQBytesMessageMarshallerTest.cpp"
 								>
 								<FileConfiguration
@@ -6259,6 +6251,14 @@
 						RelativePath="..\src\test\decaf\internal\net\URIEncoderDecoderTest.h"
 						>
 					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\net\URIHelperTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\net\URIHelperTest.h"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj?rev=730407&r1=730406&r2=730407&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Wed Dec 31 07:14:14 2008
@@ -7655,6 +7655,18 @@
 						RelativePath="..\src\main\decaf\internal\net\URIEncoderDecoder.h"
 						>
 					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\net\URIHelper.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\net\URIHelper.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\net\URIType.h"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="nio"



Mime
View raw message