Author: tabish
Date: Thu Mar 19 15:16:53 2009
New Revision: 756040
URL: http://svn.apache.org/viewvc?rev=756040&view=rev
Log:
Changes needed to build on Windows
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardErrorOutputStream.cpp
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardOutputStream.cpp
activemq/activemq-cpp/trunk/src/main/decaf/lang/Pointer.h
activemq/activemq-cpp/trunk/src/main/decaf/util/Comparator.h
activemq/activemq-cpp/trunk/src/main/decaf/util/StlList.h
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
Thu Mar 19 15:16:53 2009
@@ -639,7 +639,7 @@
////////////////////////////////////////////////////////////////////////////////
const ConnectionInfo& ActiveMQConnection::getConnectionInfo() const
- throw( exceptions::ActiveMQException ) {
+ throw( ActiveMQException ) {
enforceConnected();
@@ -648,7 +648,7 @@
////////////////////////////////////////////////////////////////////////////////
const ConnectionId& ActiveMQConnection::getConnectionId() const
- throw( exceptions::ActiveMQException ) {
+ throw( ActiveMQException ) {
enforceConnected();
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
Thu Mar 19 15:16:53 2009
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
Pointer<Transport> TcpTransportFactory::create( const decaf::net::URI&
location )
- throw ( exceptions::ActiveMQException ) {
+ throw ( ActiveMQException ) {
try{
@@ -68,7 +68,7 @@
////////////////////////////////////////////////////////////////////////////////
Pointer<Transport> TcpTransportFactory::createComposite( const
decaf::net::URI& location )
- throw ( exceptions::ActiveMQException ) {
+ throw ( ActiveMQException ) {
try{
@@ -89,7 +89,7 @@
Pointer<Transport> TcpTransportFactory::doCreateComposite( const
decaf::net::URI& location,
const
Pointer<wireformat::WireFormat>& wireFormat,
const
decaf::util::Properties& properties )
- throw ( exceptions::ActiveMQException ) {
+ throw ( ActiveMQException ) {
try {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp Thu Mar
19 15:16:53 2009
@@ -287,8 +287,8 @@
uri.toString() );
}
- int p;
- int intialParen = ssp.find( "(" );
+ std::size_t p;
+ std::size_t intialParen = ssp.find( "(" );
if( intialParen == 0 ) {
rc.setHost( ssp.substr( 0, intialParen ) );
p = rc.getHost().find( "/" );
Modified:
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardErrorOutputStream.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardErrorOutputStream.cpp?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardErrorOutputStream.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardErrorOutputStream.cpp
Thu Mar 19 15:16:53 2009
@@ -69,7 +69,7 @@
"StandardErrorOutputStream::write - offset passed is greater than
length" );
}
- for( int i = 0; i < len; ++i ) {
+ for( std::size_t i = 0; i < len; ++i ) {
std::cerr << buffer[i+offset];
}
}
Modified:
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardOutputStream.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardOutputStream.cpp?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardOutputStream.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/main/decaf/internal/io/StandardOutputStream.cpp
Thu Mar 19 15:16:53 2009
@@ -69,7 +69,7 @@
"StandardOutputStream::write - offset passed is greater than
length" );
}
- for( int i = 0; i < len; ++i ) {
+ for( std::size_t i = 0; i < len; ++i ) {
std::cout << buffer[i+offset];
}
}
Modified: activemq/activemq-cpp/trunk/src/main/decaf/lang/Pointer.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/lang/Pointer.h?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/lang/Pointer.h (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/lang/Pointer.h Thu Mar 19
15:16:53 2009
@@ -24,6 +24,7 @@
#include <decaf/util/concurrent/atomic/AtomicInteger.h>
#include <decaf/util/Comparator.h>
#include <memory>
+#include <algorithm>
namespace decaf {
namespace lang {
Modified: activemq/activemq-cpp/trunk/src/main/decaf/util/Comparator.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/util/Comparator.h?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/util/Comparator.h (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/util/Comparator.h Thu Mar 19
15:16:53 2009
@@ -20,6 +20,7 @@
#include <decaf/util/Config.h>
#include <algorithm>
+#include <functional>
namespace decaf{
namespace util{
Modified: activemq/activemq-cpp/trunk/src/main/decaf/util/StlList.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/util/StlList.h?rev=756040&r1=756039&r2=756040&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/util/StlList.h (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/util/StlList.h Thu Mar 19
15:16:53 2009
@@ -130,10 +130,10 @@
virtual int nextIndex() const {
if( this->current == this->list->end() ) {
- return this->list->size();
+ return (int)this->list->size();
}
- return std::distance( this->list->begin(), this->current );
+ return (int)std::distance( this->list->begin(), this->current
);
}
virtual int previousIndex() const {
@@ -141,7 +141,7 @@
return -1;
}
- return std::distance( this->list->begin(), this->current ) - 1;
+ return (int)std::distance( this->list->begin(), this->current
) - 1;
}
};
@@ -222,10 +222,10 @@
virtual int nextIndex() const {
if( this->current == this->list->end() ) {
- return this->list->size();
+ return (int)this->list->size();
}
- return std::distance( this->list->begin(), this->current );
+ return (int)std::distance( this->list->begin(), this->current
);
}
virtual int previousIndex() const {
@@ -233,7 +233,7 @@
return -1;
}
- return std::distance( this->list->begin(), this->current ) - 1;
+ return (int)std::distance( this->list->begin(), this->current
) - 1;
}
};
