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 2007/11/19 21:27:13 UTC
svn commit: r596434 - in /activemq/activemq-cpp/tags/activemq-cpp-2.1.2: ./
src/main/activemq/io/ src/main/activemq/network/ src/main/activemq/util/
src/test/activemq/io/ src/test/activemq/network/
Author: tabish
Date: Mon Nov 19 12:27:12 2007
New Revision: 596434
URL: http://svn.apache.org/viewvc?rev=596434&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-154
Modified:
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/configure.ac
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/io/DataOutputStream.cpp
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketError.cpp
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketInputStream.cpp
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/util/PrimitiveMap.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/BufferedInputStreamTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayInputStreamTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayOutputStreamTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataInputStreamTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataOutputStreamTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketFactoryTest.h
activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketTest.h
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/configure.ac?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/configure.ac (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/configure.ac Mon Nov 19 12:27:12 2007
@@ -109,7 +109,9 @@
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
- PLAT_CXXFLAGS="-ansi -pedantic"
+ if test "$GCC" = "yes"; then
+ PLAT_CXXFLAGS="-ansi -pedantic"
+ fi
PLAT_LIBS="-lm -lpthread -luuid -lsocket -lrt"
;;
@@ -118,20 +120,30 @@
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
- PLAT_CXXFLAGS="-ansi -pedantic"
+ if test "$GCC" = "yes"; then
+ PLAT_CXXFLAGS="-ansi -pedantic"
+ fi
PLAT_LIBS="-lm -lpthread -luuid"
esac
## Flags for building the activemq-cpp library
AC_SUBST([AMQ_CXXFLAGS])
AC_SUBST([AMQ_LIBS])
-AMQ_CXXFLAGS="$PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+if test "$GCC" = "yes"; then
+ AMQ_CXXFLAGS="$PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+else
+ AMQ_CXXFLAGS="$PLAT_CXXFLAGS -PIC"
+fi
AMQ_LIBS="$PLAT_LIBS"
## Flags for building the test applications.
AC_SUBST([AMQ_TEST_CXXFLAGS])
AC_SUBST([AMQ_TEST_LIBS])
-AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
+if test "$GCC" = "yes"; then
+ AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
+else
+ AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS"
+fi
AMQ_TEST_LIBS="../main/libactivemq-cpp.la"
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/io/DataOutputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/io/DataOutputStream.cpp?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/io/DataOutputStream.cpp (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/io/DataOutputStream.cpp Mon Nov 19 12:27:12 2007
@@ -17,6 +17,8 @@
#include "DataOutputStream.h"
#include <activemq/util/Config.h>
+#include <string.h>
+#include <stdio.h>
using namespace activemq;
using namespace activemq::io;
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketError.cpp?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketError.cpp (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketError.cpp Mon Nov 19 12:27:12 2007
@@ -17,6 +17,7 @@
#include "SocketError.h"
#include <activemq/util/Config.h>
+#include <string.h>
#if defined(HAVE_WINSOCK2_H)
#include <Winsock2.h>
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketInputStream.cpp?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketInputStream.cpp (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/network/SocketInputStream.cpp Mon Nov 19 12:27:12 2007
@@ -31,6 +31,8 @@
// Pick up FIONREAD on Solaris 2.5.
#ifdef HAVE_SYS_FILIO_H
+#include <unistd.h>
+#include <stropts.h>
#include <sys/filio.h>
#endif
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/util/PrimitiveMap.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/util/PrimitiveMap.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/util/PrimitiveMap.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/main/activemq/util/PrimitiveMap.h Mon Nov 19 12:27:12 2007
@@ -20,6 +20,8 @@
#include <string>
#include <activemq/util/Map.h>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace util{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/BufferedInputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/BufferedInputStreamTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/BufferedInputStreamTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/BufferedInputStreamTest.h Mon Nov 19 12:27:12 2007
@@ -23,7 +23,8 @@
#include <activemq/io/BufferedInputStream.h>
#include <activemq/util/Config.h>
-
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace io{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayInputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayInputStreamTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayInputStreamTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayInputStreamTest.h Mon Nov 19 12:27:12 2007
@@ -22,6 +22,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <activemq/io/ByteArrayInputStream.h>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace io{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayOutputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayOutputStreamTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayOutputStreamTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/ByteArrayOutputStreamTest.h Mon Nov 19 12:27:12 2007
@@ -22,6 +22,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <activemq/io/ByteArrayOutputStream.h>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace io{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataInputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataInputStreamTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataInputStreamTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataInputStreamTest.h Mon Nov 19 12:27:12 2007
@@ -26,6 +26,8 @@
#include <activemq/io/BufferedInputStream.h>
#include <activemq/io/ByteArrayInputStream.h>
#include <activemq/io/DataInputStream.h>
+#include <string.h>
+#include <stdio.h>
#ifdef min
#undef min
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataOutputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataOutputStreamTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataOutputStreamTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/io/DataOutputStreamTest.h Mon Nov 19 12:27:12 2007
@@ -24,6 +24,8 @@
#include <activemq/util/Endian.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/ByteArrayOutputStream.h>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace io{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketFactoryTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketFactoryTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketFactoryTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketFactoryTest.h Mon Nov 19 12:27:12 2007
@@ -28,6 +28,8 @@
#include <activemq/concurrent/Thread.h>
#include <sstream>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace network{
Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketTest.h?rev=596434&r1=596433&r2=596434&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketTest.h (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.2/src/test/activemq/network/SocketTest.h Mon Nov 19 12:27:12 2007
@@ -27,6 +27,8 @@
#include <activemq/concurrent/Thread.h>
#include <list>
#include <string.h>
+#include <string.h>
+#include <stdio.h>
namespace activemq{
namespace network{