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 2013/08/23 00:22:22 UTC
svn commit: r1516643 - in /activemq/activemq-cpp/trunk/activemq-cpp/src:
main/activemq/commands/ test/decaf/io/
Author: tabish
Date: Thu Aug 22 22:22:21 2013
New Revision: 1516643
URL: http://svn.apache.org/r1516643
Log:
Fix warnings from vs2010
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.h?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.h Thu Aug 22 22:22:21 2013
@@ -70,7 +70,7 @@ namespace commands{
}
virtual decaf::lang::Pointer<commands::Command> visit(
- activemq::state::CommandVisitor* visitor ) throw( exceptions::ActiveMQException );
+ activemq::state::CommandVisitor* visitor );
/**
* Get the current Wireformat Version
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp Thu Aug 22 22:22:21 2013
@@ -108,7 +108,7 @@ namespace {
return this->closed;
}
- virtual int available() const throw (IOException){
+ virtual int available() const {
if( isClosed() ) {
throw IOException(
__FILE__, __LINE__,
@@ -118,7 +118,7 @@ namespace {
return len - pos;
}
- virtual int doReadByte() throw (IOException){
+ virtual int doReadByte() {
if( this->isThrowOnRead() ) {
throw IOException(
__FILE__, __LINE__,
@@ -132,10 +132,7 @@ namespace {
return data.c_str()[pos++];
}
- virtual int doReadArrayOffsetAndLength( unsigned char* buffer, int size, int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException ) {
+ virtual int doReadArrayOffsetAndLength( unsigned char* buffer, int size, int offset, int length ) {
int numToRead = std::min( length, available() );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp Thu Aug 22 22:22:21 2013
@@ -43,7 +43,7 @@ namespace {
const char* getBuffer() const{ return buffer; }
- virtual void doWriteByte( unsigned char c ) throw (IOException){
+ virtual void doWriteByte( unsigned char c ) {
if( pos >= 100 ){
throw IOException();
}
@@ -52,10 +52,7 @@ namespace {
}
virtual void doWriteByteArrayBounded( const unsigned char* buffer, int size,
- int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+ int offset, int length ) {
if( (pos + length) > 100 ){
throw IOException();
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp Thu Aug 22 22:22:21 2013
@@ -57,7 +57,7 @@ namespace {
return this->closed;
}
- virtual int available() const throw (IOException){
+ virtual int available() {
if( isClosed() ) {
throw IOException(
__FILE__, __LINE__,
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp Thu Aug 22 22:22:21 2013
@@ -56,10 +56,7 @@ namespace {
protected:
virtual int doReadArrayBounded( char* buffer, int size,
- int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+ int offset, int length ) {
if( contents.empty() ) {
return -1;
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp?rev=1516643&r1=1516642&r2=1516643&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp Thu Aug 22 22:22:21 2013
@@ -62,10 +62,7 @@ namespace {
}
virtual void doWriteArrayBounded(
- const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+ const char* buffer, int size, int offset, int length ) {
if( NULL == contents ) {
throw IOException( __FILE__, __LINE__, "Writer was already closed." );