activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r451386 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: ./ src/main/activemq/connector/stomp/ src/main/activemq/connector/stomp/commands/ src/main/activemq/io/ src/main/activemq/network/ src/main/activemq/transport/
Date Fri, 29 Sep 2006 18:59:50 GMT
Author: tabish
Date: Fri Sep 29 11:59:49 2006
New Revision: 451386

URL: http://svn.apache.org/viewvc?view=rev&rev=451386
Log:
http://issues.apache.org/activemq/browse/AMQ-924

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/makefile.cfg
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/makefile.cfg
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/makefile.cfg?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/makefile.cfg (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/makefile.cfg Fri Sep 29 11:59:49 2006
@@ -17,11 +17,6 @@
 
 CURRENT = $(PWD)
 
-# --- select compiler for structure
-# ----------------------------------------------------------
-
-include $(MAKESUPPORT_HOME)/makefile-$(OSTYPE)-$(CONFIG).cfg
-
 # --- set generic commmands
 # ----------------------------------------------------------
 
@@ -40,6 +35,11 @@
 CD       = cd
 STRIP    = strip
 
+# --- select compiler for structure
+# ----------------------------------------------------------
+
+include $(MAKESUPPORT_HOME)/makefile-$(OSTYPE)-$(CONFIG).cfg
+
 # --- set default targets and their handling procedures
 # ----------------------------------------------------------
 
@@ -104,10 +104,13 @@
 	$(AR) $(ARFLAGS) $@ $(OFILES)
 	
 $(TESTEXE):	$(OTESTFILES)
+	$(ECHO) "    - Creating test "$@
+	$(ECHO) "$(LD) -o $@ ($OTESTFILES) $(LDFLAGS)"
 	$(LD) -o $@ $(OTESTFILES) $(LDFLAGS)
 	$(ECHO) 'Finished building target: $@'
 	
 $(INTEGRATIONEXE):	$(OINTEGRATIONFILES)
+	$(ECHO) "    - Creating integration test"$@
 	$(LD) -o $@ $(OINTEGRATIONFILES) $(LDFLAGS)
 	$(ECHO) 'Finished building target: $@'
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
Fri Sep 29 11:59:49 2006
@@ -401,6 +401,7 @@
     }
     AMQ_CATCH_RETHROW( ConnectorException )
     AMQ_CATCHALL_THROW( ConnectorException );
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -416,6 +417,7 @@
     }
     AMQ_CATCH_RETHROW( ConnectorException )
     AMQ_CATCHALL_THROW( ConnectorException );
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -549,6 +551,7 @@
     }
     AMQ_CATCH_RETHROW( ConnectorException )
     AMQ_CATCHALL_THROW( ConnectorException );
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -677,6 +680,7 @@
     }
     AMQ_CATCH_RETHROW( ConnectorException )
     AMQ_CATCHALL_THROW( ConnectorException );
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
Fri Sep 29 11:59:49 2006
@@ -19,6 +19,7 @@
 #define ACTIVEMQ_CONNECTOR_STOMP_STOMPFRAMEWRAPPER_H_
  
 #include <string>
+#include <string.h>
 #include <map>
 #include <activemq/util/SimpleProperties.h>
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h
Fri Sep 29 11:59:49 2006
@@ -21,6 +21,7 @@
 #include <cms/TextMessage.h>
 #include <activemq/connector/stomp/commands/StompMessage.h>
 #include <activemq/connector/stomp/commands/CommandConstants.h>
+#include <string.h>
 
 namespace activemq{
 namespace connector{

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h
Fri Sep 29 11:59:49 2006
@@ -139,7 +139,7 @@
          * input stream.
          */
         virtual int available() const{   
-            return distance( pos, buffer.end() );
+            return std::distance( pos, buffer.end() );
         }
             
         /**

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
Fri Sep 29 11:59:49 2006
@@ -23,6 +23,7 @@
     #include <sys/socket.h>
     #include <netinet/in.h>
     #include <arpa/inet.h>
+    #include <string.h>
     extern int errno;
 #else
     #include <Winsock2.h>

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
Fri Sep 29 11:59:49 2006
@@ -23,6 +23,7 @@
     #include <sys/socket.h>
     #include <netinet/in.h>
     #include <arpa/inet.h>
+    #include <string.h>
     extern int errno;
 #else
     #include <Winsock2.h>

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h?view=diff&rev=451386&r1=451385&r2=451386
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h
Fri Sep 29 11:59:49 2006
@@ -25,6 +25,7 @@
 #include <activemq/concurrent/Mutex.h>
 #include <activemq/concurrent/Concurrent.h>
 #include <map>
+#include <stdio.h>
 
 namespace activemq{
 namespace transport{



Mime
View raw message